admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move most jasmine global usage into boot.

Browse Source 
- thor build scripts broken for now.
This commit is contained in:
Davis W. Frank & Rajan Agaskar
2012-12-03 14:54:05 -08:00
parent b6c3999c3a
commit e2af08e0a6
23 changed files with 423 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/core/WaitsForBlockSpec.js
View File

@@ -7,7 +7,7 @@ describe('WaitsForBlock', function () {
timeout = 1000;
spec = new jasmine.Spec(env, suite);
message = "some error message";
onComplete = jasmine.createSpy("onComplete");
onComplete = originalJasmine.createSpy("onComplete");
});
describe("jasmine.VERBOSE", function() {
@@ -63,7 +63,7 @@ describe('WaitsForBlock', function () {
});
it('should fail spec and call onComplete if there is an error in the latchFunction', function() {
var latchFunction = jasmine.createSpy('latchFunction').andThrow('some error');
var latchFunction = originalJasmine.createSpy('latchFunction').andThrow('some error');
spyOn(spec, 'fail');
var block = new jasmine.WaitsForBlock(env, timeout, latchFunction, message, spec);
block.execute(onComplete);
@@ -74,7 +74,7 @@ describe('WaitsForBlock', function () {
describe("if latchFunction returns false", function() {
var latchFunction, fakeTimer;
beforeEach(function() {
latchFunction = jasmine.createSpy('latchFunction').andReturn(false);
latchFunction = originalJasmine.createSpy('latchFunction').andReturn(false);
fakeTimer = new jasmine.FakeTimer();
env.setTimeout = fakeTimer.setTimeout;
env.clearTimeout = fakeTimer.clearTimeout;