Skip to content
Permalink
Browse files

Merge branch 'feature/mocha' into develop

  • Loading branch information...
rtsan committed Sep 11, 2014
2 parents d922c1a + 75c9374 commit a79e5ac9ec55b4d1d8d261dad106aee38c9dde18
Showing with 21,936 additions and 6 deletions.
  1. +1 −1 .gitignore
  2. +12 −3 Gruntfile.coffee
  3. +1 −0 README.md
  4. +1 −0 tests/mocha/.gitignore
  5. +4,613 −0 tests/mocha/chai.js
  6. BIN tests/mocha/enchant.js/icon0.png
  7. BIN tests/mocha/enchant.js/start.png
  8. +223 −0 tests/mocha/enchant.js/test_binary-input-manager.js
  9. +10 −0 tests/mocha/enchant.js/test_binary-input-source.js
  10. +512 −0 tests/mocha/enchant.js/test_canvas-layer.js
  11. +465 −0 tests/mocha/enchant.js/test_canvas-renderer.js
  12. +52 −0 tests/mocha/enchant.js/test_canvas-scene.js
  13. +66 −0 tests/mocha/enchant.js/test_class.js
  14. +794 −0 tests/mocha/enchant.js/test_core.js
  15. +191 −0 tests/mocha/enchant.js/test_deferred.js
  16. +94 −0 tests/mocha/enchant.js/test_detect-color-manager.js
  17. +331 −0 tests/mocha/enchant.js/test_dom-layer.js
  18. +549 −0 tests/mocha/enchant.js/test_dom-manager.js
  19. +52 −0 tests/mocha/enchant.js/test_dom-scene.js
  20. +404 −0 tests/mocha/enchant.js/test_easing.js
  21. +62 −0 tests/mocha/enchant.js/test_enchant.html
  22. +9 −0 tests/mocha/enchant.js/test_enchant.js
  23. +152 −0 tests/mocha/enchant.js/test_entity.js
  24. +148 −0 tests/mocha/enchant.js/test_event-target.js
  25. +84 −0 tests/mocha/enchant.js/test_event.js
  26. +101 −0 tests/mocha/enchant.js/test_group.js
  27. +162 −0 tests/mocha/enchant.js/test_input-manager.js
  28. +41 −0 tests/mocha/enchant.js/test_input-source.js
  29. +92 −0 tests/mocha/enchant.js/test_keyboard-input-manager.js
  30. +27 −0 tests/mocha/enchant.js/test_keyboard-input-source.js
  31. +194 −0 tests/mocha/enchant.js/test_label.js
  32. +69 −0 tests/mocha/enchant.js/test_loading-scene.js
  33. +276 −0 tests/mocha/enchant.js/test_map.js
  34. +72 −0 tests/mocha/enchant.js/test_matrix.js
  35. +111 −0 tests/mocha/enchant.js/test_node.js
  36. +314 −0 tests/mocha/enchant.js/test_scene.js
  37. +186 −0 tests/mocha/enchant.js/test_sprite.js
  38. +134 −0 tests/mocha/enchant.js/test_surface.js
  39. +31 −0 tests/mocha/mixing.enchant.js/test_mixing.html
  40. +367 −0 tests/mocha/mixing.enchant.js/test_mixing.js
  41. +270 −0 tests/mocha/mocha.css
  42. +5,816 −0 tests/mocha/mocha.js
  43. +4,721 −0 tests/mocha/sinon-1.8.1.js
  44. BIN tests/mocha/ui.enchant.js/font0.png
  45. +33 −0 tests/mocha/ui.enchant.js/test_mutable_text.html
  46. +89 −0 tests/mocha/ui.enchant.js/test_mutable_text.js
  47. +4 −2 tests/qunit/mixing.enchant.js/mixing.js
@@ -10,4 +10,4 @@ lang/*
!build/readme.md
enchant.js
enchant.min.js
npm-debug.log
npm-debug.log
@@ -113,8 +113,16 @@ module.exports = (grunt) ->
files: [ 'tests/qunit/*/*.html' ]

mocha:
all: 'tests/mocha/*.html'
core: 'test/mocha/enchant.js/*.html'
all:
src: ['tests/mocha/**/*.html']
options:
log: true
reporter: 'Spec'
core:
src: ['tests/mocha/enchant.js/*.html']
options:
log: true
reporter: 'Spec'

exec:
whatever:
@@ -132,10 +140,11 @@ module.exports = (grunt) ->
grunt.loadNpmTasks 'grunt-contrib-concat'
grunt.loadNpmTasks 'grunt-contrib-uglify'
grunt.loadNpmTasks 'grunt-contrib-qunit'
grunt.loadNpmTasks 'grunt-mocha'
grunt.loadNpmTasks 'grunt-contrib-watch'
grunt.loadNpmTasks 'grunt-mocha'
grunt.loadNpmTasks 'grunt-exec'
grunt.loadTasks 'tasks/'

# Default task.
grunt.registerTask 'default', [ 'jshint:core', 'concat', 'uglify', 'qunit', 'lang:en', 'lang:ja', 'lang:de', 'build' ]
grunt.registerTask 'default', [ 'jshint:core', 'concat', 'uglify', 'mocha', 'lang:en', 'lang:ja', 'lang:de', 'build' ]
@@ -88,6 +88,7 @@ Build Tasks
- `grunt uglify` generate enchant.min.js from dev/enchant.js
- `grunt exec:lang` generate enchant.js (English comment only) from dev/enchant.js
- `grunt qunit` do qunit tests with phantomjs (headless browser)
- `grunt mocha` do mocha tests with phantomjs (headless browser)

If you wish to send your codes to github repos, don't forget to run `grunt` command before you commit your change!

@@ -0,0 +1 @@
!enchant.js/

0 comments on commit a79e5ac

Please sign in to comment.
You can’t perform that action at this time.