Browse files

Merge pull request #11 from vojtajina/small-fixes

Small fixes
  • Loading branch information...
2 parents cdc7f40 + dacf4df commit 6567cede1c300705682d66c1a667fb7a6d7a3f0c @ibolmo committed May 6, 2011
Showing with 4 additions and 3 deletions.
  1. +1 −1 src-test/tests.js
  2. +3 −2 src/JasmineAdapter.js
View
2 src-test/tests.js
@@ -93,7 +93,7 @@ xdescribe('should not execute', function(){
it('no-op', function(){
ran = true;
});
-})
+});
describe('should not have run', function(){
it('should still be false', function(){
View
5 src/JasmineAdapter.js
@@ -108,14 +108,15 @@ describe = intercept('describe');
beforeEach = intercept('beforeEach');
afterEach = intercept('afterEach');
-var template = TestCase('Jasmine Adapter Tests', null, 'jasmine test case');
+var JASMINE_TYPE = 'jasmine test case';
+TestCase('Jasmine Adapter Tests', null, JASMINE_TYPE);
jstestdriver.pluginRegistrar.register({
name: 'jasmine',
runTestConfiguration: function(config, onTestDone, onComplete){
- if (config.testCaseInfo_.template_ !== template) return;
+ if (config.getTestCaseInfo().getType() != JASMINE_TYPE) return false;
(jasmine.currentEnv_ = new Env(onTestDone, onComplete)).execute();
return true;
},

0 comments on commit 6567ced

Please sign in to comment.