From 68a3a33e5ffeeb095dade9f63d6d6167d65b0978 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Tue, 25 Aug 2015 10:51:36 +0000 Subject: [PATCH 01/12] Removed 'use mocha' from codebase. Fixed issue with architect_resolver_test that lennart reported. --- package.json | 18 +++++++++--------- plugins/c9.cli.publish/publish_test.js | 2 +- .../mock/plugins/c9.dummy/architect_test.js | 1 + .../mock/c9.ide.example3/plugin_test.js | 2 +- .../templates/plugin.default/plugin_test.js | 2 +- .../templates/plugin.simple/plugin_test.js | 2 +- plugins/c9.ide.terminal/predict_echo_test.js | 2 +- plugins/c9.static/build_test.js | 2 +- plugins/c9.vfs.server/download_test.js | 2 +- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index d30c8a6f..5a2ac2f9 100644 --- a/package.json +++ b/package.json @@ -56,22 +56,22 @@ ], "c9plugins": { "c9.ide.language": "#f2ca50a521", - "c9.ide.language.css": "#ef8a28943e", + "c9.ide.language.css": "#a649f2a710", "c9.ide.language.generic": "#77d43cfaf0", - "c9.ide.language.html": "#99efa2853f", + "c9.ide.language.html": "#0f4078c187", "c9.ide.language.html.diff": "#24f3608d26", "c9.ide.language.javascript": "#8479d0a9c1", "c9.ide.language.javascript.immediate": "#0535804ada", "c9.ide.language.javascript.eslint": "#08e0af061f", - "c9.ide.language.javascript.tern": "#da9db9ea65", - "c9.ide.language.javascript.infer": "#4c9a4282ff", - "c9.ide.language.jsonalyzer": "#0717d1510f", - "c9.ide.collab": "#b49eda3791", + "c9.ide.language.javascript.tern": "#1ce68f29a5", + "c9.ide.language.javascript.infer": "#8478e3c702", + "c9.ide.language.jsonalyzer": "#82cdb1acaf", + "c9.ide.collab": "#c74666f592", "c9.ide.local": "#a9703b630c", "c9.ide.find": "#e073bf251a", "c9.ide.find.infiles": "#c132ad243c", "c9.ide.find.replace": "#44772dd796", - "c9.ide.run.debug": "#25a59d1269", + "c9.ide.run.debug": "#3e9ce59b1b", "c9.automate": "#47e2c429c9", "c9.ide.ace.emmet": "#6dc4585e02", "c9.ide.ace.gotoline": "#a8ff07c8f4", @@ -91,7 +91,7 @@ "c9.ide.immediate": "#6845a93705", "c9.ide.installer": "#be8d9aa07c", "c9.ide.mount": "#816dbe987b", - "c9.ide.navigate": "#f358997d93", + "c9.ide.navigate": "#6e4efa5b25", "c9.ide.newresource": "#f1f0624768", "c9.ide.openfiles": "#28a4f5af16", "c9.ide.preview": "#a75e218d3e", @@ -104,7 +104,7 @@ "c9.ide.processlist": "#bc11818bb5", "c9.ide.run": "#dc74ede441", "c9.ide.run.build": "#ad45874c88", - "c9.ide.run.debug.xdebug": "#3b1520f83d", + "c9.ide.run.debug.xdebug": "#61dcbd0180", "c9.ide.save": "#cc613b6ead", "c9.ide.scm": "#f3847917b8", "c9.ide.terminal.monitor": "#b52a3f2144", diff --git a/plugins/c9.cli.publish/publish_test.js b/plugins/c9.cli.publish/publish_test.js index 401b70c4..27574203 100644 --- a/plugins/c9.cli.publish/publish_test.js +++ b/plugins/c9.cli.publish/publish_test.js @@ -1,7 +1,7 @@ /*global describe it before after beforeEach afterEach define*/ "use strict"; "use server"; -"use mocha"; + "use blacklist"; require("c9/inline-mocha")(module); diff --git a/plugins/c9.fs/mock/plugins/c9.dummy/architect_test.js b/plugins/c9.fs/mock/plugins/c9.dummy/architect_test.js index 5211ea9e..c6694785 100644 --- a/plugins/c9.fs/mock/plugins/c9.dummy/architect_test.js +++ b/plugins/c9.fs/mock/plugins/c9.dummy/architect_test.js @@ -15,6 +15,7 @@ define(function(require, exports, module) { function main(options, imports, register) { var Plugin = imports.Plugin; var ui = imports.ui; + imports. // This is needed for architect_resolver_test /***** Initialization *****/ diff --git a/plugins/c9.ide.plugins/mock/c9.ide.example3/plugin_test.js b/plugins/c9.ide.plugins/mock/c9.ide.example3/plugin_test.js index 3ae2262d..c2c4345d 100644 --- a/plugins/c9.ide.plugins/mock/c9.ide.example3/plugin_test.js +++ b/plugins/c9.ide.plugins/mock/c9.ide.example3/plugin_test.js @@ -1,5 +1,5 @@ "use client"; -"use mocha"; + define(function(require, exports, module) { main.consumes = ["plugin.test", "myplugin"]; diff --git a/plugins/c9.ide.plugins/templates/plugin.default/plugin_test.js b/plugins/c9.ide.plugins/templates/plugin.default/plugin_test.js index 72b1a7fa..45294de1 100644 --- a/plugins/c9.ide.plugins/templates/plugin.default/plugin_test.js +++ b/plugins/c9.ide.plugins/templates/plugin.default/plugin_test.js @@ -1,5 +1,5 @@ "use client"; -"use mocha"; + define(function(require, exports, module) { main.consumes = ["plugin.test", "myplugin"]; diff --git a/plugins/c9.ide.plugins/templates/plugin.simple/plugin_test.js b/plugins/c9.ide.plugins/templates/plugin.simple/plugin_test.js index 13007893..dabc0245 100644 --- a/plugins/c9.ide.plugins/templates/plugin.simple/plugin_test.js +++ b/plugins/c9.ide.plugins/templates/plugin.simple/plugin_test.js @@ -1,5 +1,5 @@ "use client"; -"use mocha"; + define(function(require, exports, module) { main.consumes = ["plugin.test", "myplugin"]; diff --git a/plugins/c9.ide.terminal/predict_echo_test.js b/plugins/c9.ide.terminal/predict_echo_test.js index c6a8f357..ac225ed9 100644 --- a/plugins/c9.ide.terminal/predict_echo_test.js +++ b/plugins/c9.ide.terminal/predict_echo_test.js @@ -1,7 +1,7 @@ /*global describe it before beforeEach after bar =*/ "use client"; -"use mocha"; + require(["lib/architect/architect", "lib/chai/chai", "/vfs-root", "ace/test/assertions"], function (architect, chai, baseProc) { var expect = chai.expect; diff --git a/plugins/c9.static/build_test.js b/plugins/c9.static/build_test.js index c4a96d33..73c7e33f 100755 --- a/plugins/c9.static/build_test.js +++ b/plugins/c9.static/build_test.js @@ -3,7 +3,7 @@ "use strict"; "use server"; -"use mocha"; + require("c9/inline-mocha")(module); diff --git a/plugins/c9.vfs.server/download_test.js b/plugins/c9.vfs.server/download_test.js index 7717a8be..5f9109c6 100755 --- a/plugins/c9.vfs.server/download_test.js +++ b/plugins/c9.vfs.server/download_test.js @@ -1,7 +1,7 @@ #!/usr/bin/env node "use strict"; "use server"; -"use mocha"; + require("c9/inline-mocha")(module); if (typeof define === "undefined") { From 75d998c5b9e675f50cb9866062f9d872e96cd099 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 26 Aug 2015 12:16:51 +0200 Subject: [PATCH 02/12] c9-auto-bump 3.0.2477 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aa69b084..fd814497 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2476", + "version": "3.0.2477", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ca88eb67a8b049b4571ebab464c0d5c91a34a783 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 26 Aug 2015 12:25:48 +0200 Subject: [PATCH 03/12] c9-auto-bump 3.0.2478 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fd814497..80c33218 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2477", + "version": "3.0.2478", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4dc7cd79a1f324db201833e4bc718c5f1d5eb6d9 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 26 Aug 2015 12:37:17 +0200 Subject: [PATCH 04/12] c9-auto-bump 3.0.2479 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 80c33218..8ff39f52 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2478", + "version": "3.0.2479", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From fe90f65921048e4cdfd41cf9581261a6cc527b29 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 26 Aug 2015 13:07:15 +0200 Subject: [PATCH 05/12] c9-auto-bump 3.0.2480 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8ff39f52..19e54460 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2479", + "version": "3.0.2480", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 680234a0a612e029ab3b3039e8185507f00d1957 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 26 Aug 2015 13:07:59 +0200 Subject: [PATCH 06/12] c9-auto-bump 3.0.2481 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 19e54460..1d40af51 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2480", + "version": "3.0.2481", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2bceac58ff633df9793170853e68d6f69ecbb7eb Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 26 Aug 2015 13:28:33 +0200 Subject: [PATCH 07/12] c9-auto-bump 3.0.2482 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d40af51..950c9815 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2481", + "version": "3.0.2482", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8c965d76607189a5cd3cb4980f769214fc687e45 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 26 Aug 2015 13:47:55 +0200 Subject: [PATCH 08/12] c9-auto-bump 3.0.2483 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 950c9815..db839a2f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2482", + "version": "3.0.2483", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c56634a13371c60afa9bc7fc79c46b752666cfeb Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 26 Aug 2015 13:51:16 +0200 Subject: [PATCH 09/12] c9-auto-bump 3.0.2484 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0bfd0bc0..ce735624 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2483", + "version": "3.0.2484", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 432cb5e9f7c3c7d661d590a99e428356d171a46a Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 26 Aug 2015 13:53:30 +0200 Subject: [PATCH 10/12] c9-auto-bump 3.0.2485 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ce735624..8bacd357 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2484", + "version": "3.0.2485", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ffe3126249b755d2428d40086afd2f2131bd1180 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 26 Aug 2015 13:53:46 +0200 Subject: [PATCH 11/12] c9-auto-bump 3.0.2486 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8bacd357..901caf51 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2485", + "version": "3.0.2486", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f47025e8adfa547d75ef73017211dd800a99f473 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 26 Aug 2015 13:54:50 +0200 Subject: [PATCH 12/12] c9-auto-bump 3.0.2487 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 901caf51..fa92098d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2486", + "version": "3.0.2487", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9",