Commit 4ea4fdaf authored by Robert Speicher's avatar Robert Speicher

Merge branch 'revert-1b54982f' into 'master'

Revert "Merge branch 'karma-headless-chrome' into 'master'"

See merge request !12137
parents d5ccfb5a a526e619
...@@ -441,7 +441,6 @@ gitlab:assets:compile: ...@@ -441,7 +441,6 @@ gitlab:assets:compile:
- webpack-report/ - webpack-report/
karma: karma:
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-golang-1.8-git-2.7-chrome-59.0-node-7.1-postgresql-9.6"
stage: test stage: test
<<: *use-pg <<: *use-pg
<<: *dedicated-runner <<: *dedicated-runner
......
---
title: Replace PhantomJS with headless Chrome for karma test suite
merge_request: 12036
author:
...@@ -21,7 +21,7 @@ module.exports = function(config) { ...@@ -21,7 +21,7 @@ module.exports = function(config) {
var karmaConfig = { var karmaConfig = {
basePath: ROOT_PATH, basePath: ROOT_PATH,
browsers: ['ChromeHeadless'], browsers: ['PhantomJS'],
frameworks: ['jasmine'], frameworks: ['jasmine'],
files: [ files: [
{ pattern: 'spec/javascripts/test_bundle.js', watched: false }, { pattern: 'spec/javascripts/test_bundle.js', watched: false },
......
import LinkedTabs from '~/lib/utils/bootstrap_linked_tabs'; 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', () => { describe('Linked Tabs', () => {
preloadFixtures('static/linked_tabs.html.raw'); preloadFixtures('static/linked_tabs.html.raw');
...@@ -10,7 +19,9 @@ import LinkedTabs from '~/lib/utils/bootstrap_linked_tabs'; ...@@ -10,7 +19,9 @@ import LinkedTabs from '~/lib/utils/bootstrap_linked_tabs';
describe('when is initialized', () => { describe('when is initialized', () => {
beforeEach(() => { 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', () => { it('should activate the tab correspondent to the given action', () => {
...@@ -36,7 +47,7 @@ import LinkedTabs from '~/lib/utils/bootstrap_linked_tabs'; ...@@ -36,7 +47,7 @@ import LinkedTabs from '~/lib/utils/bootstrap_linked_tabs';
describe('on click', () => { describe('on click', () => {
it('should change the url according to the clicked tab', () => { it('should change the url according to the clicked tab', () => {
const historySpy = spyOn(history, 'replaceState').and.callFake(() => {}); const historySpy = !phantomjs && spyOn(history, 'replaceState').and.callFake(() => {});
const linkedTabs = new LinkedTabs({ const linkedTabs = new LinkedTabs({
action: 'show', action: 'show',
......
...@@ -5,6 +5,15 @@ import '~/pager'; ...@@ -5,6 +5,15 @@ import '~/pager';
import '~/commits'; 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', () => { describe('Commits List', () => {
beforeEach(() => { beforeEach(() => {
setFixtures(` setFixtures(`
...@@ -52,7 +61,9 @@ import '~/commits'; ...@@ -52,7 +61,9 @@ import '~/commits';
CommitsList.init(25); CommitsList.init(25);
CommitsList.searchField.val(''); CommitsList.searchField.val('');
if (!phantomjs) {
spyOn(history, 'replaceState').and.stub(); spyOn(history, 'replaceState').and.stub();
}
ajaxSpy = spyOn(jQuery, 'ajax').and.callFake((req) => { ajaxSpy = spyOn(jQuery, 'ajax').and.callFake((req) => {
req.success({ req.success({
data: '<li>Result</li>', data: '<li>Result</li>',
......
...@@ -12,6 +12,15 @@ import '~/notes'; ...@@ -12,6 +12,15 @@ import '~/notes';
import 'vendor/jquery.scrollTo'; import 'vendor/jquery.scrollTo';
(function () { (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 () { describe('MergeRequestTabs', function () {
var stubLocation = {}; var stubLocation = {};
var setLocation = function (stubs) { var setLocation = function (stubs) {
...@@ -28,9 +37,11 @@ import 'vendor/jquery.scrollTo'; ...@@ -28,9 +37,11 @@ import 'vendor/jquery.scrollTo';
this.class = new gl.MergeRequestTabs({ stubLocation: stubLocation }); this.class = new gl.MergeRequestTabs({ stubLocation: stubLocation });
setLocation(); setLocation();
if (!phantomjs) {
this.spies = { this.spies = {
history: spyOn(window.history, 'replaceState').and.callFake(function () {}) history: spyOn(window.history, 'replaceState').and.callFake(function () {})
}; };
}
}); });
afterEach(function () { afterEach(function () {
...@@ -197,9 +208,11 @@ import 'vendor/jquery.scrollTo'; ...@@ -197,9 +208,11 @@ import 'vendor/jquery.scrollTo';
pathname: '/foo/bar/merge_requests/1' pathname: '/foo/bar/merge_requests/1'
}); });
newState = this.subject('commits'); newState = this.subject('commits');
if (!phantomjs) {
expect(this.spies.history).toHaveBeenCalledWith({ expect(this.spies.history).toHaveBeenCalledWith({
url: newState url: newState
}, document.title, newState); }, document.title, newState);
}
}); });
it('treats "show" like "notes"', function () { it('treats "show" like "notes"', function () {
......
...@@ -95,7 +95,7 @@ describe('Interval Pattern Input Component', function () { ...@@ -95,7 +95,7 @@ describe('Interval Pattern Input Component', function () {
describe('User Actions', function () { describe('User Actions', function () {
beforeEach(function () { beforeEach(function () {
// For an unknown reason, some browsers do not propagate click events // For an unknown reason, Phantom.js doesn't trigger click events
// on radio buttons in a way Vue can register. So, we have to mount // on radio buttons in a way Vue can register. So, we have to mount
// to a fixture. // to a fixture.
setFixtures('<div id="my-mount"></div>'); setFixtures('<div id="my-mount"></div>');
......
import Pipelines from '~/pipelines'; import Pipelines from '~/pipelines';
// Fix for phantomJS
if (!Element.prototype.matches && Element.prototype.webkitMatchesSelector) {
Element.prototype.matches = Element.prototype.webkitMatchesSelector;
}
describe('Pipelines', () => { describe('Pipelines', () => {
preloadFixtures('static/pipeline_graph.html.raw'); preloadFixtures('static/pipeline_graph.html.raw');
......
...@@ -87,7 +87,7 @@ describe('Header CI Component', () => { ...@@ -87,7 +87,7 @@ describe('Header CI Component', () => {
vm.actions[0].isLoading = true; vm.actions[0].isLoading = true;
Vue.nextTick(() => { Vue.nextTick(() => {
expect(vm.$el.querySelector('.btn .fa-spinner').getAttribute('style')).toBeFalsy(); expect(vm.$el.querySelector('.btn .fa-spinner').getAttribute('style')).toEqual('');
done(); done();
}); });
}); });
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment