Merge branch 'main' into 3.99
This commit is contained in:
@@ -54,7 +54,7 @@ Jasmine tests itself across many browsers (Safari, Chrome, Firefox, Microsoft Ed
|
|||||||
| Node | 10, 12, 14, 16 |
|
| Node | 10, 12, 14, 16 |
|
||||||
| Safari | 8-14 |
|
| Safari | 8-14 |
|
||||||
| Chrome | Evergreen |
|
| Chrome | Evergreen |
|
||||||
| Firefox | Evergreen, 68, 78 |
|
| Firefox | Evergreen, 68, 78, 91 |
|
||||||
| Edge | Evergreen |
|
| Edge | Evergreen |
|
||||||
| Internet Explorer | 10, 11 |
|
| Internet Explorer | 10, 11 |
|
||||||
|
|
||||||
|
|||||||
@@ -1036,7 +1036,7 @@ x */
|
|||||||
if (this.message) {
|
if (this.message) {
|
||||||
this.excludeMessage = message;
|
this.excludeMessage = message;
|
||||||
}
|
}
|
||||||
this.pend();
|
this.pend(message);
|
||||||
};
|
};
|
||||||
|
|
||||||
Spec.prototype.getResult = function() {
|
Spec.prototype.getResult = function() {
|
||||||
|
|||||||
12
release_notes/3.10.1.md
Normal file
12
release_notes/3.10.1.md
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
# Jasmine Core 3.10.1 Release Notes
|
||||||
|
|
||||||
|
## Bugfixes
|
||||||
|
|
||||||
|
* Fixed missing pendingReason in pending spec results
|
||||||
|
* Fixes [#1939](https://github.com/jasmine/jasmine/issues/1939)
|
||||||
|
* Merges [#1940](https://github.com/jasmine/jasmine/pull/1940) from @jan-molak
|
||||||
|
|
||||||
|
|
||||||
|
------
|
||||||
|
|
||||||
|
_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_
|
||||||
@@ -27,6 +27,7 @@ run_browser "internet explorer" 11
|
|||||||
run_browser "internet explorer" 10
|
run_browser "internet explorer" 10
|
||||||
run_browser chrome latest
|
run_browser chrome latest
|
||||||
run_browser firefox latest
|
run_browser firefox latest
|
||||||
|
run_browser firefox 91
|
||||||
run_browser firefox 78
|
run_browser firefox 78
|
||||||
run_browser firefox 68
|
run_browser firefox 68
|
||||||
run_browser safari 14
|
run_browser safari 14
|
||||||
|
|||||||
@@ -538,6 +538,18 @@ describe('Env', function() {
|
|||||||
expect(excludeSpy).toHaveBeenCalledWith('Temporarily disabled with xit');
|
expect(excludeSpy).toHaveBeenCalledWith('Temporarily disabled with xit');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('calls spec.pend with "Temporarily disabled with xit"', function() {
|
||||||
|
var pendSpy = jasmine.createSpy();
|
||||||
|
var realExclude = jasmineUnderTest.Spec.prototype.exclude;
|
||||||
|
|
||||||
|
spyOn(env, 'it_').and.returnValue({
|
||||||
|
exclude: realExclude,
|
||||||
|
pend: pendSpy
|
||||||
|
});
|
||||||
|
env.xit('foo', function() {});
|
||||||
|
expect(pendSpy).toHaveBeenCalledWith('Temporarily disabled with xit');
|
||||||
|
});
|
||||||
|
|
||||||
it('throws an error when it receives a non-fn argument', function() {
|
it('throws an error when it receives a non-fn argument', function() {
|
||||||
expect(function() {
|
expect(function() {
|
||||||
env.xit('undefined arg', null);
|
env.xit('undefined arg', null);
|
||||||
|
|||||||
@@ -254,7 +254,7 @@ x */
|
|||||||
if (this.message) {
|
if (this.message) {
|
||||||
this.excludeMessage = message;
|
this.excludeMessage = message;
|
||||||
}
|
}
|
||||||
this.pend();
|
this.pend(message);
|
||||||
};
|
};
|
||||||
|
|
||||||
Spec.prototype.getResult = function() {
|
Spec.prototype.getResult = function() {
|
||||||
|
|||||||
Reference in New Issue
Block a user