Permalink
Browse files

Putting video.test.js in dist/ now instead of test. Don't want to com…

…mit video.test.js because it will cause merge conflicts on pull requests.
  • Loading branch information...
1 parent 2effe5a commit f82296b4c1d694cdd8e86908670e922c058ae0eb @heff heff committed Jan 19, 2013
Showing with 123 additions and 4 deletions.
  1. +0 −1 .gitignore
  2. +1 −1 Gruntfile.js
  3. +1 −1 test/compiled.html
  4. +1 −1 test/index.html
  5. +120 −0 test/video.test.js
View
@@ -9,4 +9,3 @@ node_modules
npm-debug.log
sandbox/*
!sandbox/*.example
-test/video.test.js
View
@@ -26,7 +26,7 @@ module.exports = function(grunt) {
sourcelist: 'dist/sourcelist.txt',
src: ['test/unit/*.js'],
externs: ['src/js/media.flash.externs.js', 'test/qunit/qunit-externs.js'],
- dest: 'test/video.test.js'
+ dest: 'dist/video.test.js'
}
},
dist: {
View
@@ -15,7 +15,7 @@
so we can automatically run compiled tests too.
(in test/index.html you can add ?compiled to also run compiled tests)
-->
- <script src="video.test.js"></script>
+ <script src="../dist/video.test.js"></script>
</head>
<body>
View
@@ -26,7 +26,7 @@
'test/unit/core.js',
'test/unit/media.html5.js'
];
- var compiledTests = "test/video.test.js";
+ var compiledTests = "dist/video.test.js";
var scripts = [];
// Choose either the raw source and tests
Oops, something went wrong.

0 comments on commit f82296b

Please sign in to comment.