Commit 6e085eea authored by Clement Ho's avatar Clement Ho

Merge branch 'sh-bump-chrome-golang-ci-image' into 'master'

Bump CI image to use Chrome 71.0 and Golang 1.11

Closes #56614 and #55578

See merge request gitlab-org/gitlab-ce!24572
parents 61c51d3b 0152cb0d
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29" image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.11-git-2.18-chrome-71.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29"
.dedicated-runner: &dedicated-runner .dedicated-runner: &dedicated-runner
retry: 1 retry: 1
...@@ -627,7 +627,7 @@ gitlab:setup-mysql: ...@@ -627,7 +627,7 @@ gitlab:setup-mysql:
# Frontend-related jobs # Frontend-related jobs
gitlab:assets:compile: gitlab:assets:compile:
<<: *dedicated-no-docs-pull-cache-job <<: *dedicated-no-docs-pull-cache-job
image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-69.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-71.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1
dependencies: [] dependencies: []
services: services:
- docker:stable-dind - docker:stable-dind
......
...@@ -31,12 +31,14 @@ export function setupFeatureHighlightPopover(id, debounceTimeout = 300) { ...@@ -31,12 +31,14 @@ export function setupFeatureHighlightPopover(id, debounceTimeout = 300) {
.removeAttr('disabled'); .removeAttr('disabled');
} }
const getPriority = e => parseInt(e.dataset.highlightPriority, 10) || 0;
export function findHighestPriorityFeature() { export function findHighestPriorityFeature() {
let priorityFeature; let priorityFeature;
const sortedFeatureEls = [].slice const sortedFeatureEls = [].slice
.call(document.querySelectorAll('.js-feature-highlight')) .call(document.querySelectorAll('.js-feature-highlight'))
.sort((a, b) => (a.dataset.highlightPriority || 0) < (b.dataset.highlightPriority || 0)); .sort((a, b) => getPriority(b) - getPriority(a));
const [priorityFeatureEl] = sortedFeatureEls; const [priorityFeatureEl] = sortedFeatureEls;
if (priorityFeatureEl) { if (priorityFeatureEl) {
......
...@@ -33,11 +33,13 @@ describe('DiscussionCounter component', () => { ...@@ -33,11 +33,13 @@ describe('DiscussionCounter component', () => {
...discussionMock, ...discussionMock,
id: discussionMock.id, id: discussionMock.id,
notes: [{ ...discussionMock.notes[0], resolvable: true, resolved: true }], notes: [{ ...discussionMock.notes[0], resolvable: true, resolved: true }],
resolved: true,
}, },
{ {
...discussionMock, ...discussionMock,
id: discussionMock.id + 1, id: discussionMock.id + 1,
notes: [{ ...discussionMock.notes[0], resolvable: true, resolved: false }], notes: [{ ...discussionMock.notes[0], resolvable: true, resolved: false }],
resolved: false,
}, },
]; ];
const firstDiscussionId = discussionMock.id + 1; const firstDiscussionId = discussionMock.id + 1;
......
...@@ -5,7 +5,7 @@ import notify from '~/lib/utils/notify'; ...@@ -5,7 +5,7 @@ import notify from '~/lib/utils/notify';
import { stateKey } from '~/vue_merge_request_widget/stores/state_maps'; import { stateKey } from '~/vue_merge_request_widget/stores/state_maps';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import mockData from './mock_data'; import mockData from './mock_data';
import { faviconDataUrl, overlayDataUrl, faviconWithOverlayDataUrl } from '../lib/utils/mock_data'; import { faviconDataUrl, overlayDataUrl } from '../lib/utils/mock_data';
const returnPromise = data => const returnPromise = data =>
new Promise(resolve => { new Promise(resolve => {
...@@ -340,17 +340,27 @@ describe('mrWidgetOptions', () => { ...@@ -340,17 +340,27 @@ describe('mrWidgetOptions', () => {
vm.mr.ciStatusFaviconPath = overlayDataUrl; vm.mr.ciStatusFaviconPath = overlayDataUrl;
vm.setFaviconHelper() vm.setFaviconHelper()
.then(() => { .then(() => {
expect(faviconElement.getAttribute('href')).toEqual(faviconWithOverlayDataUrl); /*
It would be better if we'd could mock commonUtils.setFaviconURL
with a spy and test that it was called. We are doing the following
tests as a proxy to show that the function has been called
*/
expect(faviconElement.getAttribute('href')).not.toEqual(null);
expect(faviconElement.getAttribute('href')).not.toEqual(overlayDataUrl);
expect(faviconElement.getAttribute('href')).not.toEqual(faviconDataUrl);
done(); done();
}) })
.catch(done.fail); .catch(done.fail);
}); });
it('should not call setFavicon when there is no ciStatusFaviconPath', () => { it('should not call setFavicon when there is no ciStatusFaviconPath', done => {
vm.mr.ciStatusFaviconPath = null; vm.mr.ciStatusFaviconPath = null;
vm.setFaviconHelper(); vm.setFaviconHelper()
.then(() => {
expect(faviconElement.getAttribute('href')).toEqual(null); expect(faviconElement.getAttribute('href')).toEqual(null);
done();
})
.catch(done.fail);
}); });
}); });
......
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