Fix putting the spec file in the same directory as require.js

cloudchen · Mar 27, 2015 · f94d9c7 · f94d9c7
1 parent dad367d
commit f94d9c7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -143,6 +143,19 @@ module.exports = function(grunt) {
           }
         }
       },
+      'require-outfile-same-dir': {
+        src: 'test/fixtures/require-baseurl/src/**/*.js',
+        options: {
+          outfile: ".grunt/grunt-contrib-jasmine/_SpecRunner.html",
+          specs: 'test/fixtures/require-baseurl/spec/**/*Spec.js',
+          template: require('./'),
+          templateOptions: {
+            requireConfig: {
+              baseUrl: '../../test/fixtures/require-baseurl/src/'
+            }
+          }
+        }
+      },
     },
     bump: {
       options: {

diff --git a/src/templates/jasmine-requirejs.html b/src/templates/jasmine-requirejs.html
@@ -7,14 +7,14 @@
   <% css.forEach(function(style){ %>
   <link rel="stylesheet" type="text/css" href="<%= style %>">
   <% }) %>
-  
+
   <% with (scripts) { %>
   <% [].concat(vendor).forEach(function(script){ %>
   <script src="<%= script %>"></script>
   <% }) %>
   <% }; %>
 
-  <script src="<%= temp %>/require.js"></script>
+  <script src="<%= temp ? temp + "/" : temp %>require.js"></script>
 
   <% with (scripts) { %>
   <% [].concat(jasmine, boot, helpers).forEach(function(script){ %>