Merge branch 'select-spec' of https://github.com/jlpstolwijk/jasmine into main
* Merges #1920 from @jlpstolwijk * Fixes spec filtering in Karma * Fixes #1906
This commit is contained in:
@@ -208,7 +208,10 @@ jasmineRequire.HtmlReporter = function(j$) {
|
|||||||
' of ' +
|
' of ' +
|
||||||
totalSpecsDefined +
|
totalSpecsDefined +
|
||||||
' specs - run all';
|
' specs - run all';
|
||||||
var skippedLink = addToExistingQueryString('spec', '');
|
// include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906
|
||||||
|
var skippedLink =
|
||||||
|
(window.location.pathname || '') +
|
||||||
|
addToExistingQueryString('spec', '');
|
||||||
alert.appendChild(
|
alert.appendChild(
|
||||||
createDom(
|
createDom(
|
||||||
'span',
|
'span',
|
||||||
@@ -635,7 +638,11 @@ jasmineRequire.HtmlReporter = function(j$) {
|
|||||||
suite = suite.parent;
|
suite = suite.parent;
|
||||||
}
|
}
|
||||||
|
|
||||||
return addToExistingQueryString('spec', els.join(' '));
|
// include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906
|
||||||
|
return (
|
||||||
|
(window.location.pathname || '') +
|
||||||
|
addToExistingQueryString('spec', els.join(' '))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function addDeprecationWarnings(result, runnableType) {
|
function addDeprecationWarnings(result, runnableType) {
|
||||||
@@ -699,11 +706,19 @@ jasmineRequire.HtmlReporter = function(j$) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function specHref(result) {
|
function specHref(result) {
|
||||||
return addToExistingQueryString('spec', result.fullName);
|
// include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906
|
||||||
|
return (
|
||||||
|
(window.location.pathname || '') +
|
||||||
|
addToExistingQueryString('spec', result.fullName)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function seedHref(seed) {
|
function seedHref(seed) {
|
||||||
return addToExistingQueryString('seed', seed);
|
// include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906
|
||||||
|
return (
|
||||||
|
(window.location.pathname || '') +
|
||||||
|
addToExistingQueryString('seed', seed)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function defaultQueryString(key, value) {
|
function defaultQueryString(key, value) {
|
||||||
|
|||||||
@@ -484,7 +484,7 @@ describe('HtmlReporter', function() {
|
|||||||
var suiteDetail = outerSuite.childNodes[0];
|
var suiteDetail = outerSuite.childNodes[0];
|
||||||
var suiteLink = suiteDetail.childNodes[0];
|
var suiteLink = suiteDetail.childNodes[0];
|
||||||
expect(suiteLink.innerHTML).toEqual('A Suite');
|
expect(suiteLink.innerHTML).toEqual('A Suite');
|
||||||
expect(suiteLink.getAttribute('href')).toEqual('?foo=bar&spec=A Suite');
|
expect(suiteLink.getAttribute('href')).toEqual('/?foo=bar&spec=A Suite');
|
||||||
|
|
||||||
var specs = outerSuite.childNodes[1];
|
var specs = outerSuite.childNodes[1];
|
||||||
var spec = specs.childNodes[0];
|
var spec = specs.childNodes[0];
|
||||||
@@ -494,7 +494,7 @@ describe('HtmlReporter', function() {
|
|||||||
var specLink = spec.childNodes[0];
|
var specLink = spec.childNodes[0];
|
||||||
expect(specLink.innerHTML).toEqual('with a spec');
|
expect(specLink.innerHTML).toEqual('with a spec');
|
||||||
expect(specLink.getAttribute('href')).toEqual(
|
expect(specLink.getAttribute('href')).toEqual(
|
||||||
'?foo=bar&spec=A Suite with a spec'
|
'/?foo=bar&spec=A Suite with a spec'
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1050,7 +1050,7 @@ describe('HtmlReporter', function() {
|
|||||||
var seedBar = container.querySelector('.jasmine-seed-bar');
|
var seedBar = container.querySelector('.jasmine-seed-bar');
|
||||||
expect(seedBar.textContent).toBe(', randomized with seed 424242');
|
expect(seedBar.textContent).toBe(', randomized with seed 424242');
|
||||||
var seedLink = container.querySelector('.jasmine-seed-bar a');
|
var seedLink = container.querySelector('.jasmine-seed-bar a');
|
||||||
expect(seedLink.getAttribute('href')).toBe('?seed=424242');
|
expect(seedLink.getAttribute('href')).toBe('/?seed=424242');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not show the current seed bar if not randomizing', function() {
|
it('should not show the current seed bar if not randomizing', function() {
|
||||||
@@ -1099,7 +1099,7 @@ describe('HtmlReporter', function() {
|
|||||||
reporter.jasmineDone({ order: { random: true } });
|
reporter.jasmineDone({ order: { random: true } });
|
||||||
|
|
||||||
var skippedLink = container.querySelector('.jasmine-skipped a');
|
var skippedLink = container.querySelector('.jasmine-skipped a');
|
||||||
expect(skippedLink.getAttribute('href')).toEqual('?foo=bar&spec=');
|
expect(skippedLink.getAttribute('href')).toEqual('/?foo=bar&spec=');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -177,7 +177,10 @@ jasmineRequire.HtmlReporter = function(j$) {
|
|||||||
' of ' +
|
' of ' +
|
||||||
totalSpecsDefined +
|
totalSpecsDefined +
|
||||||
' specs - run all';
|
' specs - run all';
|
||||||
var skippedLink = addToExistingQueryString('spec', '');
|
// include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906
|
||||||
|
var skippedLink =
|
||||||
|
(window.location.pathname || '') +
|
||||||
|
addToExistingQueryString('spec', '');
|
||||||
alert.appendChild(
|
alert.appendChild(
|
||||||
createDom(
|
createDom(
|
||||||
'span',
|
'span',
|
||||||
@@ -604,7 +607,11 @@ jasmineRequire.HtmlReporter = function(j$) {
|
|||||||
suite = suite.parent;
|
suite = suite.parent;
|
||||||
}
|
}
|
||||||
|
|
||||||
return addToExistingQueryString('spec', els.join(' '));
|
// include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906
|
||||||
|
return (
|
||||||
|
(window.location.pathname || '') +
|
||||||
|
addToExistingQueryString('spec', els.join(' '))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function addDeprecationWarnings(result, runnableType) {
|
function addDeprecationWarnings(result, runnableType) {
|
||||||
@@ -668,11 +675,19 @@ jasmineRequire.HtmlReporter = function(j$) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function specHref(result) {
|
function specHref(result) {
|
||||||
return addToExistingQueryString('spec', result.fullName);
|
// include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906
|
||||||
|
return (
|
||||||
|
(window.location.pathname || '') +
|
||||||
|
addToExistingQueryString('spec', result.fullName)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function seedHref(seed) {
|
function seedHref(seed) {
|
||||||
return addToExistingQueryString('seed', seed);
|
// include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906
|
||||||
|
return (
|
||||||
|
(window.location.pathname || '') +
|
||||||
|
addToExistingQueryString('seed', seed)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function defaultQueryString(key, value) {
|
function defaultQueryString(key, value) {
|
||||||
|
|||||||
Reference in New Issue
Block a user