Do not put modules used by specs on the root.
Modules in root is now installed by npm, and the native modules are now not usable by atom-shell.
This commit is contained in:
Родитель
dc9778f0f2
Коммит
ac31dc9672
11
package.json
11
package.json
|
@ -4,15 +4,8 @@
|
||||||
|
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"atom-package-manager": "0.44.x",
|
"atom-package-manager": "0.44.x",
|
||||||
"coffee-script": "~1.6.3",
|
"coffee-script": "~1.7.1",
|
||||||
"coffeelint": "~0.6.1",
|
"coffeelint": "~1.3.0"
|
||||||
"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"
|
|
||||||
},
|
},
|
||||||
|
|
||||||
"private": true,
|
"private": true,
|
||||||
|
|
|
@ -21,6 +21,7 @@ def main():
|
||||||
update_submodules()
|
update_submodules()
|
||||||
update_node_modules('.')
|
update_node_modules('.')
|
||||||
update_atom_modules('atom/browser/default_app')
|
update_atom_modules('atom/browser/default_app')
|
||||||
|
update_atom_modules('spec')
|
||||||
bootstrap_brightray(args.url)
|
bootstrap_brightray(args.url)
|
||||||
if sys.platform == 'cygwin':
|
if sys.platform == 'cygwin':
|
||||||
update_win32_python()
|
update_win32_python()
|
||||||
|
|
|
@ -1,5 +1,15 @@
|
||||||
{
|
{
|
||||||
"name": "atom-shell-specs",
|
"name": "atom-shell-specs",
|
||||||
"main": "static/main.js",
|
"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"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<meta name="referrer" content="always">
|
<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>
|
<script src="jquery-2.0.3.min.js"></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
require('remote').getCurrentWindow().inspectElement(e.clientX, e.clientY);
|
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');
|
var ipc = require('ipc');
|
||||||
|
|
||||||
// Rediret all output to browser.
|
// Rediret all output to browser.
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
var runner = mocha.run(function() {
|
var runner = mocha.run(function() {
|
||||||
Mocha.utils.highlightTags('code');
|
Mocha.utils.highlightTags('code');
|
||||||
if (isCi)
|
if (isCi)
|
||||||
ipc.sendChannel('process.exit', runner.failures);
|
ipc.send('process.exit', runner.failures);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
})();
|
})();
|
||||||
|
|
Загрузка…
Ссылка в новой задаче