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

Removed expect/expectAsync indirection through spec/suite

Browse Source
This commit is contained in:
Steve Gravrock
2023-06-21 19:23:54 -07:00
parent f8e4ea868f
commit 59600a1c29
4 changed files with 16 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/jasmine-core/jasmine.js
View File

@@ -809,14 +809,6 @@ getJasmineRequireObj().Spec = function(j$) {
this.result.properties[key] = value; this.result.properties[key] = value;
}; };
Spec.prototype.expect = function(actual) {
return this.expectationFactory(actual, this);
};
Spec.prototype.expectAsync = function(actual) {
return this.asyncExpectationFactory(actual, this);
};
Spec.prototype.execute = function( Spec.prototype.execute = function(
queueRunnerFactory, queueRunnerFactory,
onComplete, onComplete,
@@ -1904,23 +1896,27 @@ getJasmineRequireObj().Env = function(j$) {
}; };
this.expect = function(actual) { this.expect = function(actual) {
if (!runner.currentRunable()) { const runable = runner.currentRunable();
if (!runable) {
throw new Error( throw new Error(
"'expect' was used when there was no current spec, this could be because an asynchronous test timed out" "'expect' was used when there was no current spec, this could be because an asynchronous test timed out"
); );
} }
return runner.currentRunable().expect(actual); return runable.expectationFactory(actual, runable);
}; };
this.expectAsync = function(actual) { this.expectAsync = function(actual) {
if (!runner.currentRunable()) { const runable = runner.currentRunable();
if (!runable) {
throw new Error( throw new Error(
"'expectAsync' was used when there was no current spec, this could be because an asynchronous test timed out" "'expectAsync' was used when there was no current spec, this could be because an asynchronous test timed out"
); );
} }
return runner.currentRunable().expectAsync(actual); return runable.asyncExpectationFactory(actual, runable);
}; };
this.beforeEach = function(beforeEachFunction, timeout) { this.beforeEach = function(beforeEachFunction, timeout) {
@@ -9755,14 +9751,6 @@ getJasmineRequireObj().Suite = function(j$) {
this.result.properties[key] = value; this.result.properties[key] = value;
}; };
Suite.prototype.expect = function(actual) {
return this.expectationFactory(actual, this);
};
Suite.prototype.expectAsync = function(actual) {
return this.asyncExpectationFactory(actual, this);
};
Suite.prototype.getFullName = function() { Suite.prototype.getFullName = function() {
const fullName = []; const fullName = [];
for ( for (

12
src/core/Env.js
View File

@@ -767,23 +767,27 @@ getJasmineRequireObj().Env = function(j$) {
}; };
this.expect = function(actual) { this.expect = function(actual) {
if (!runner.currentRunable()) { const runable = runner.currentRunable();
if (!runable) {
throw new Error( throw new Error(
"'expect' was used when there was no current spec, this could be because an asynchronous test timed out" "'expect' was used when there was no current spec, this could be because an asynchronous test timed out"
); );
} }
return runner.currentRunable().expect(actual); return runable.expectationFactory(actual, runable);
}; };
this.expectAsync = function(actual) { this.expectAsync = function(actual) {
if (!runner.currentRunable()) { const runable = runner.currentRunable();
if (!runable) {
throw new Error( throw new Error(
"'expectAsync' was used when there was no current spec, this could be because an asynchronous test timed out" "'expectAsync' was used when there was no current spec, this could be because an asynchronous test timed out"
); );
} }
return runner.currentRunable().expectAsync(actual); return runable.asyncExpectationFactory(actual, runable);
}; };
this.beforeEach = function(beforeEachFunction, timeout) { this.beforeEach = function(beforeEachFunction, timeout) {

8
src/core/Spec.js
View File

@@ -70,14 +70,6 @@ getJasmineRequireObj().Spec = function(j$) {
this.result.properties[key] = value; this.result.properties[key] = value;
}; };
Spec.prototype.expect = function(actual) {
return this.expectationFactory(actual, this);
};
Spec.prototype.expectAsync = function(actual) {
return this.asyncExpectationFactory(actual, this);
};
Spec.prototype.execute = function( Spec.prototype.execute = function(
queueRunnerFactory, queueRunnerFactory,
onComplete, onComplete,

8
src/core/Suite.js
View File

@@ -28,14 +28,6 @@ getJasmineRequireObj().Suite = function(j$) {
this.result.properties[key] = value; this.result.properties[key] = value;
}; };
Suite.prototype.expect = function(actual) {
return this.expectationFactory(actual, this);
};
Suite.prototype.expectAsync = function(actual) {
return this.asyncExpectationFactory(actual, this);
};
Suite.prototype.getFullName = function() { Suite.prototype.getFullName = function() {
const fullName = []; const fullName = [];
for ( for (