Skip to content

Commit

Permalink
Merge pull request webrtc#454 from chuckhays/446
Browse files Browse the repository at this point in the history
Use compiled js for unit tests.
  • Loading branch information
jiayliu committed Jan 30, 2015
2 parents c4ee2e5 + 9265855 commit c30d0da
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 24 deletions.
6 changes: 3 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ module.exports = function(grunt) {
grunt.loadTasks('grunt-chrome-build');

// set default tasks to run when grunt is called without parameters
grunt.registerTask('default', ['csslint', 'htmlhint', 'jscs', 'jshint',
'shell:runPythonTests', 'jstdPhantom',
'closurecompiler:debug']);
grunt.registerTask('default', ['csslint', 'htmlhint',
'jscs', 'jshint', 'shell:runPythonTests', 'jstests']);
grunt.registerTask('jstests', ['closurecompiler:debug', 'jstdPhantom']);
grunt.registerTask('build', ['closurecompiler:debug', 'grunt-chrome-build']);
// also possible to call JavaScript directly in registerTask()
// or to call external tasks with grunt.loadTasks()
Expand Down
22 changes: 1 addition & 21 deletions samples/web/content/apprtc/js_test_driver.conf
Original file line number Diff line number Diff line change
@@ -1,28 +1,8 @@
server: http://localhost:9876

# The order of these files is important and should match
# the order they are loaded in index.html.
# The wildcard match *.js should catch any newly added files.
load:
- js/testpolyfills.js
- js/stats.js
- js/util.js
- js/adapter.js
- js/loopback.js
- js/signalingchannel.js
- js/sdputils.js
- js/peerconnectionclient.js
- js/call.js
- js/infobox.js
- js/appcontroller.js
- js/background.js
- js/*.js

# appwindow.js is the Chrome App equivalent of index.html
# and builds up the entire app. The tests don't currently
# load any html, which breaks much of the code.
exclude:
- js/appwindow.js
- js/compiled/apprtc.debug.js

test:
- js/*_test.js

0 comments on commit c30d0da

Please sign in to comment.