Copy build to test dir for testing, run directly from test dir.

davidkaneda · Feb 17, 2013 · a70a572 · a70a572
1 parent 48a51cd
commit a70a572
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -96,7 +96,12 @@ module.exports = (grunt) ->
 
             else
               content
-
+      test:
+        expand: yes
+        cwd: '<%= dirs.build %>'
+        dest: 'test/build/'
+        src: '**/*'
+
       zepto:
         files: [
           expand: yes
@@ -132,7 +137,7 @@ module.exports = (grunt) ->
           cssDir: '<%= dirs.css %>'
 
     qunit:
-      files: ["<%= dirs.build %>/test/unit/*.html"]
+      files: ["test/unit/*.html"]
 
     uglify:
       options:
@@ -208,8 +213,8 @@ module.exports = (grunt) ->
   grunt.registerTask "jquery-bridge", ["zepto", "copy:jquery-bridge"]
 
   # Tests & checks
-  grunt.registerTask "test", ["copy:prepare", "qunit"]
   grunt.registerTask "cq", ["jshint", "light", "jshint"]
+  grunt.registerTask "test", ["copy:prepare", "copy:test", "qunit"]
 
   # Full-build tasks
   grunt.registerTask "light", ["nuke", "copy:prepare", "compass"]

diff --git a/test/unit/jqtouch-with-zepto.html b/test/unit/jqtouch-with-zepto.html
@@ -6,8 +6,8 @@
   <title>jQTouch with Zepto</title>
   <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-git.css" type="text/css" media="screen">  
   <script type="text/javascript" src="http://code.jquery.com/qunit/qunit-git.js"></script>  
-  <script src="../../lib/zepto/zepto.js"></script>
-  <script src="../../src/jqtouch.js"></script>
+  <script src="../build/lib/zepto/zepto.js"></script>
+  <script src="../build/src/jqtouch.js"></script>
 </head>
 <body>
   <h1 id="qunit-header">jQTouch with Zepto</h1>  

diff --git a/test/unit/jquery-jqtouch.html b/test/unit/jquery-jqtouch.html
@@ -4,12 +4,13 @@
   <!-- adopted from `github.com/madrobby/zepto` and modified -->
   <meta charset="utf-8">
   <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-  <title>jQTouch's touch unit tests</title>
-  <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-git.css" type="text/css" media="screen">  
-  <script type="text/javascript" src="http://code.jquery.com/qunit/qunit-git.js"></script>  
-  <script src="../../lib/jquery/jquery-1.7.min.js"></script>
-  <script src="../../src/jqtouch.js"></script>
-  <script src="../../src/jqtouch-jquery.js"></script>
+  <title>jQTouch’s touch unit tests</title>
+  <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-git.css" type="text/css" media="screen">
+  <script type="text/javascript" src="http://code.jquery.com/qunit/qunit-git.js"></script>
+
+  <script src="../build/lib/jquery/jquery-1.7.js"></script>
+  <script src="../build/src/jqtouch.js"></script>
+  <script src="../build/src/jqtouch-jquery.js"></script>
 </head>
 <body>
   <h1 id="qunit-header">jQTouch's touch unit tests</h1>  

diff --git a/test/unit/touch.html b/test/unit/touch.html
@@ -7,7 +7,7 @@
   <title>Zepto touch unit tests</title>
   <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-git.css" type="text/css" media="screen">  
   <script type="text/javascript" src="http://code.jquery.com/qunit/qunit-git.js"></script>  
-  <script src="../../lib/zepto/zepto.js"></script>
+  <script src="../build/lib/zepto/zepto.js"></script>
 </head>
 <body>
   <h1 id="qunit-header">Touch Test</h1>