projects / platform / framework / web / crosswalk-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dc9778f)
Do not put modules used by specs on the root.
authorCheng Zhao <zcbenz@gmail.com>
Tue, 29 Apr 2014 03:51:49 +0000 (11:51 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 29 Apr 2014 03:51:49 +0000 (11:51 +0800)
Modules in root is now installed by npm, and the native modules are now
not usable by atom-shell.

package.json patch | blob | history
script/bootstrap.py patch | blob | history
spec/package.json patch | blob | history
spec/static/index.html patch | blob | history

diff --git a/package.json b/package.json
index 4530dee..d93b07f 100644 (file)
--- a/package.json
+++ b/package.json
@@ -4,15 +4,8 @@
 
   "devDependencies": {
     "atom-package-manager": "0.44.x",
-    "coffee-script": "~1.6.3",
-    "coffeelint": "~0.6.1",
-    "formidable": "~1.0.14",
-    "mocha": "~1.13.0",
-    "pathwatcher": "0.14.0",
-    "q": "0.9.7",
-    "runas": "0.5.*",
-    "temp": "~0.6.0",
-    "walkdir": "~0.0.7"
+    "coffee-script": "~1.7.1",
+    "coffeelint": "~1.3.0"
   },
 
   "private": true,
diff --git a/script/bootstrap.py b/script/bootstrap.py
index 1921998..5b7ec06 100755 (executable)
--- a/script/bootstrap.py
+++ b/script/bootstrap.py
@@ -21,6 +21,7 @@ def main():
   update_submodules()
   update_node_modules('.')
   update_atom_modules('atom/browser/default_app')
+  update_atom_modules('spec')
   bootstrap_brightray(args.url)
   if sys.platform == 'cygwin':
     update_win32_python()
diff --git a/spec/package.json b/spec/package.json
index 843e675..f3b37c6 100644 (file)
--- a/spec/package.json
+++ b/spec/package.json
@@ -1,5 +1,15 @@
 {
   "name": "atom-shell-specs",
   "main": "static/main.js",
-  "version": "0.1.0"
+  "version": "0.1.0",
+
+  "devDependencies": {
+    "formidable": "~1.0.14",
+    "pathwatcher": "0.14.0",
+    "q": "0.9.7",
+    "mocha": "~1.18.2",
+    "runas": "0.5.*",
+    "temp": "~0.6.0",
+    "walkdir": "~0.0.7"
+  }
 }
diff --git a/spec/static/index.html b/spec/static/index.html
index cb3d76c..efd6717 100644 (file)
--- a/spec/static/index.html
+++ b/spec/static/index.html
@@ -1,7 +1,7 @@
 <html>
 <head>
   <meta name="referrer" content="always">
-  <link href="../../node_modules/mocha/mocha.css" rel="stylesheet">
+  <link href="../node_modules/mocha/mocha.css" rel="stylesheet">
   <script src="jquery-2.0.3.min.js"></script>
 </head>
 <body>
@@ -28,7 +28,7 @@
     require('remote').getCurrentWindow().inspectElement(e.clientX, e.clientY);
   }
 
-  require('coffee-script'); // Supports .coffee tests.
+  require('coffee-script/register');  // Supports .coffee tests.
   var ipc = require('ipc');
 
   // Rediret all output to browser.
@@ -70,7 +70,7 @@
     var runner = mocha.run(function() {
       Mocha.utils.highlightTags('code');
       if (isCi)
-        ipc.sendChannel('process.exit', runner.failures);
+        ipc.send('process.exit', runner.failures);
     });
   });
 })();
Domain: Web Framework / Web Runtime;