Revert "add url pathName in toQueryString function - fixes (https://github.com/jasmine/jasmine/issues/1906 ) + comment + test"
Reverted because it breaks the option checkboxes in the HTML reporter, both
in the standalone distribution and in jasmine-browser-runner.
Reopens #1906.
This reverts commit 1e4f0d1545.
This commit is contained in:
@@ -810,10 +810,7 @@ jasmineRequire.QueryString = function() {
|
|||||||
encodeURIComponent(prop) + '=' + encodeURIComponent(paramMap[prop])
|
encodeURIComponent(prop) + '=' + encodeURIComponent(paramMap[prop])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
// include getWindowLocation() to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906
|
return '?' + qStrPairs.join('&');
|
||||||
return (
|
|
||||||
(options.getWindowLocation().pathname || '') + '?' + qStrPairs.join('&')
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function queryStringToParamMap() {
|
function queryStringToParamMap() {
|
||||||
|
|||||||
@@ -48,21 +48,6 @@ describe('QueryString', function() {
|
|||||||
expect(result).toMatch(/foo=bar/);
|
expect(result).toMatch(/foo=bar/);
|
||||||
expect(result).toMatch(/baz=quux/);
|
expect(result).toMatch(/baz=quux/);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('includes url pathname with the query string including the given key/value pair', function() {
|
|
||||||
var windowLocation = {
|
|
||||||
pathname: 'debug.html',
|
|
||||||
search: '?foo=bar'
|
|
||||||
},
|
|
||||||
queryString = new jasmineUnderTest.QueryString({
|
|
||||||
getWindowLocation: function() {
|
|
||||||
return windowLocation;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
var result = queryString.fullStringWithNewParam('baz', 'quux');
|
|
||||||
expect(result).toBe('debug.html?foo=bar&baz=quux');
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('#getParam', function() {
|
describe('#getParam', function() {
|
||||||
|
|||||||
@@ -26,10 +26,7 @@ jasmineRequire.QueryString = function() {
|
|||||||
encodeURIComponent(prop) + '=' + encodeURIComponent(paramMap[prop])
|
encodeURIComponent(prop) + '=' + encodeURIComponent(paramMap[prop])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
// include getWindowLocation() to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906
|
return '?' + qStrPairs.join('&');
|
||||||
return (
|
|
||||||
(options.getWindowLocation().pathname || '') + '?' + qStrPairs.join('&')
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function queryStringToParamMap() {
|
function queryStringToParamMap() {
|
||||||
|
|||||||
Reference in New Issue
Block a user