Skip to content
This repository has been archived by the owner on Jun 15, 2021. It is now read-only.

Commit

Permalink
Uses spec discovery from the test harness
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Rees committed Apr 8, 2015
1 parent b3dcba3 commit d37f4d1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 deletions.
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -22,9 +22,9 @@
"plumber-requirejs": "~0.4.0",
"plumber-uglifyjs": "~0.4.0",
"plumber-write": "~0.4.0",
"q": "~1.0.0",
"q": "~1.2",
"request": "~2.33.0",
"scribe-test-harness": "~0.0.20",
"scribe-test-harness": "~0.0.21",
"selenium-webdriver": "~2.41.0",
"sinon": "^1.12.2"
},
Expand Down
20 changes: 5 additions & 15 deletions test/runner.js
Expand Up @@ -11,6 +11,7 @@

var Mocha = require('mocha');
var createRunner = require('scribe-test-harness/create-runner');
var testEnvironment = require('scribe-test-harness/environment');

var mocha = new Mocha();

Expand All @@ -20,18 +21,7 @@ var mocha = new Mocha();
mocha.timeout(15 * 1000);
mocha.reporter('spec');

// Unit tests
mocha.addFile(__dirname + '/unit/event-emitter.spec.js');
mocha.addFile(__dirname + '/unit/config.spec.js');

// Browser tests
mocha.addFile(__dirname + '/block-mode.spec.js');
mocha.addFile(__dirname + '/commands.spec.js');
mocha.addFile(__dirname + '/formatters.spec.js');
mocha.addFile(__dirname + '/inline-elements-mode.spec.js');
mocha.addFile(__dirname + '/patches.spec.js');
mocha.addFile(__dirname + '/undo-manager.spec.js');
mocha.addFile(__dirname + '/selection.spec.js');


createRunner(mocha);
testEnvironment.loadSpecifications(__dirname + '/**/*.spec.js', mocha)
.then(function(mocha) {
createRunner(mocha);
});

0 comments on commit d37f4d1

Please sign in to comment.