Skip to content
Browse files

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

  • Loading branch information...
1 parent 48a51cd commit a70a5723a654607010896f72c1537c05ff1ae6cb @davidkaneda davidkaneda committed
Showing with 18 additions and 12 deletions.
  1. +8 −3 Gruntfile.coffee
  2. +2 −2 test/unit/jqtouch-with-zepto.html
  3. +7 −6 test/unit/jquery-jqtouch.html
  4. +1 −1 test/unit/touch.html
View
11 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"]
View
4 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>
View
13 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>
View
2 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>

0 comments on commit a70a572

Please sign in to comment.
Something went wrong with that request. Please try again.