Load Jasmine from node_modules

theavuth9 · Jan 26, 2017 · cdac184 · cdac184
1 parent a04eebb
commit cdac184
Show file tree

Hide file tree

Showing 22 changed files with 24 additions and 4,334 deletions.
diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
     "grunt": "^1.0.1",
     "grunt-task-helper": "^0.3.8",
     "htmlclean": "^2.7.7",
+    "jasmine-core": "^2.5.2",
     "log4js": "^0.6.36",
     "node-static-alias": "^0.1.3",
     "test-page-loader": "0.0.8",

diff --git a/test/attachment-label/index.html b/test/attachment-label/index.html
@@ -5,7 +5,7 @@
   <script src="/src/defs.js"></script>
   <script src="/src/anim.js"></script>
   <script src="/src/path-data-polyfill/path-data-polyfill.js"></script>
-  <script src="/anim-event.min.js"></script>
+  <script src="/anim-event/anim-event.min.js"></script>
   <script src="/traceLog.js"></script>
   <script src="/src/leader-line.js"></script>
 

diff --git a/test/bindWindow/index.html b/test/bindWindow/index.html
@@ -5,7 +5,7 @@
   <script src="/src/defs.js"></script>
   <script src="/src/anim.js"></script>
   <script src="/src/path-data-polyfill/path-data-polyfill.js"></script>
-  <script src="/anim-event.min.js"></script>
+  <script src="/anim-event/anim-event.min.js"></script>
   <script src="/traceLog.js"></script>
   <script src="/src/leader-line.js"></script>
 

diff --git a/test/effect-show/index.html b/test/effect-show/index.html
@@ -5,7 +5,7 @@
   <script src="/src/defs.js"></script>
   <script src="/src/anim.js"></script>
   <script src="/src/path-data-polyfill/path-data-polyfill.js"></script>
-  <script src="/anim-event.min.js"></script>
+  <script src="/anim-event/anim-event.min.js"></script>
   <script src="/traceLog.js"></script>
   <script src="/src/leader-line.js"></script>
 

diff --git a/test/httpd.js b/test/httpd.js
@@ -10,8 +10,6 @@ const
   staticAlias = require('node-static-alias'),
   log4js = require('log4js');
 
-var logger;
-
 log4js.configure({
   appenders: [
     {
@@ -23,24 +21,21 @@ log4js.configure({
     }
   ]
 });
-logger = log4js.getLogger('node-static-alias');
+let logger = log4js.getLogger('node-static-alias');
 logger.setLevel(log4js.levels.INFO);
 
 http.createServer((request, response) => {
   request.addListener('end', () => {
     (new staticAlias.Server(DOC_ROOT, {
       cache: false,
       alias: [
+        // node_modules
         {
-          match: '/test-page-loader.js',
-          serve: '../node_modules/test-page-loader/test-page-loader.js',
-          allowOutside: true
-        },
-        {
-          match: '/anim-event.min.js',
-          serve: '../node_modules/anim-event/anim-event.min.js',
+          match: /^\/(?:jasmine-core|test-page-loader|anim-event)\/.+/,
+          serve: '../node_modules<% reqPath %>',
           allowOutside: true
         },
+
         {
           match: /^\/src/,
           serve: '..<% reqPath %>',

diff --git a/test/index.html b/test/index.html
@@ -2,14 +2,13 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>Jasmine Spec Runner v2.4.1</title>
+  <title>Jasmine Spec Runner</title>
 
-  <link rel="shortcut icon" type="image/png" href="jasmine-2.4.1/jasmine_favicon.png">
-  <link rel="stylesheet" href="jasmine-2.4.1/jasmine.css">
+  <link rel="stylesheet" href="/jasmine-core/lib/jasmine-core/jasmine.css">
+  <script src="/jasmine-core/lib/jasmine-core/jasmine.js"></script>
+  <script src="/jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
+  <script src="/jasmine-core/lib/jasmine-core/boot.js"></script>
 
-  <script src="jasmine-2.4.1/jasmine.js"></script>
-  <script src="jasmine-2.4.1/jasmine-html.js"></script>
-  <script src="jasmine-2.4.1/boot.js"></script>
   <script src="/test-page-loader.js"></script>
   <script src="get-source.js"></script>
   <script src="util.js"></script>

diff --git a/test/jasmine-2.4.1/boot.js b/test/jasmine-2.4.1/boot.js