remove phantomjs-specific test hacks
This commit is contained in:
parent
2111712cb7
commit
8b069dbb64
5 changed files with 10 additions and 50 deletions
15
spec/javascripts/bootstrap_linked_tabs_spec.js
vendored
15
spec/javascripts/bootstrap_linked_tabs_spec.js
vendored
|
@ -1,15 +1,6 @@
|
|||
import LinkedTabs from '~/lib/utils/bootstrap_linked_tabs';
|
||||
|
||||
(() => {
|
||||
// TODO: remove this hack!
|
||||
// PhantomJS causes spyOn to panic because replaceState isn't "writable"
|
||||
let phantomjs;
|
||||
try {
|
||||
phantomjs = !Object.getOwnPropertyDescriptor(window.history, 'replaceState').writable;
|
||||
} catch (err) {
|
||||
phantomjs = false;
|
||||
}
|
||||
|
||||
describe('Linked Tabs', () => {
|
||||
preloadFixtures('static/linked_tabs.html.raw');
|
||||
|
||||
|
@ -19,9 +10,7 @@ import LinkedTabs from '~/lib/utils/bootstrap_linked_tabs';
|
|||
|
||||
describe('when is initialized', () => {
|
||||
beforeEach(() => {
|
||||
if (!phantomjs) {
|
||||
spyOn(window.history, 'replaceState').and.callFake(function () {});
|
||||
}
|
||||
spyOn(window.history, 'replaceState').and.callFake(function () {});
|
||||
});
|
||||
|
||||
it('should activate the tab correspondent to the given action', () => {
|
||||
|
@ -47,7 +36,7 @@ import LinkedTabs from '~/lib/utils/bootstrap_linked_tabs';
|
|||
|
||||
describe('on click', () => {
|
||||
it('should change the url according to the clicked tab', () => {
|
||||
const historySpy = !phantomjs && spyOn(history, 'replaceState').and.callFake(() => {});
|
||||
const historySpy = spyOn(history, 'replaceState').and.callFake(() => {});
|
||||
|
||||
const linkedTabs = new LinkedTabs({
|
||||
action: 'show',
|
||||
|
|
|
@ -5,15 +5,6 @@ import '~/pager';
|
|||
import '~/commits';
|
||||
|
||||
(() => {
|
||||
// TODO: remove this hack!
|
||||
// PhantomJS causes spyOn to panic because replaceState isn't "writable"
|
||||
let phantomjs;
|
||||
try {
|
||||
phantomjs = !Object.getOwnPropertyDescriptor(window.history, 'replaceState').writable;
|
||||
} catch (err) {
|
||||
phantomjs = false;
|
||||
}
|
||||
|
||||
describe('Commits List', () => {
|
||||
beforeEach(() => {
|
||||
setFixtures(`
|
||||
|
@ -61,9 +52,7 @@ import '~/commits';
|
|||
CommitsList.init(25);
|
||||
CommitsList.searchField.val('');
|
||||
|
||||
if (!phantomjs) {
|
||||
spyOn(history, 'replaceState').and.stub();
|
||||
}
|
||||
spyOn(history, 'replaceState').and.stub();
|
||||
ajaxSpy = spyOn(jQuery, 'ajax').and.callFake((req) => {
|
||||
req.success({
|
||||
data: '<li>Result</li>',
|
||||
|
|
|
@ -12,15 +12,6 @@ import '~/notes';
|
|||
import 'vendor/jquery.scrollTo';
|
||||
|
||||
(function () {
|
||||
// TODO: remove this hack!
|
||||
// PhantomJS causes spyOn to panic because replaceState isn't "writable"
|
||||
var phantomjs;
|
||||
try {
|
||||
phantomjs = !Object.getOwnPropertyDescriptor(window.history, 'replaceState').writable;
|
||||
} catch (err) {
|
||||
phantomjs = false;
|
||||
}
|
||||
|
||||
describe('MergeRequestTabs', function () {
|
||||
var stubLocation = {};
|
||||
var setLocation = function (stubs) {
|
||||
|
@ -37,11 +28,9 @@ import 'vendor/jquery.scrollTo';
|
|||
this.class = new gl.MergeRequestTabs({ stubLocation: stubLocation });
|
||||
setLocation();
|
||||
|
||||
if (!phantomjs) {
|
||||
this.spies = {
|
||||
history: spyOn(window.history, 'replaceState').and.callFake(function () {})
|
||||
};
|
||||
}
|
||||
this.spies = {
|
||||
history: spyOn(window.history, 'replaceState').and.callFake(function () {})
|
||||
};
|
||||
});
|
||||
|
||||
afterEach(function () {
|
||||
|
@ -208,11 +197,9 @@ import 'vendor/jquery.scrollTo';
|
|||
pathname: '/foo/bar/merge_requests/1'
|
||||
});
|
||||
newState = this.subject('commits');
|
||||
if (!phantomjs) {
|
||||
expect(this.spies.history).toHaveBeenCalledWith({
|
||||
url: newState
|
||||
}, document.title, newState);
|
||||
}
|
||||
expect(this.spies.history).toHaveBeenCalledWith({
|
||||
url: newState
|
||||
}, document.title, newState);
|
||||
});
|
||||
|
||||
it('treats "show" like "notes"', function () {
|
||||
|
|
|
@ -95,7 +95,7 @@ describe('Interval Pattern Input Component', function () {
|
|||
|
||||
describe('User Actions', function () {
|
||||
beforeEach(function () {
|
||||
// For an unknown reason, Phantom.js doesn't trigger click events
|
||||
// For an unknown reason, some browsers do not propagate click events
|
||||
// on radio buttons in a way Vue can register. So, we have to mount
|
||||
// to a fixture.
|
||||
setFixtures('<div id="my-mount"></div>');
|
||||
|
|
|
@ -1,10 +1,5 @@
|
|||
import Pipelines from '~/pipelines';
|
||||
|
||||
// Fix for phantomJS
|
||||
if (!Element.prototype.matches && Element.prototype.webkitMatchesSelector) {
|
||||
Element.prototype.matches = Element.prototype.webkitMatchesSelector;
|
||||
}
|
||||
|
||||
describe('Pipelines', () => {
|
||||
preloadFixtures('static/pipeline_graph.html.raw');
|
||||
|
||||
|
|
Loading…
Reference in a new issue