Update failing specs & linter errors & changelog
This commit is contained in:
parent
42bfffc495
commit
f3465c7293
|
@ -1,10 +1,7 @@
|
||||||
import _ from 'underscore';
|
import _ from 'underscore';
|
||||||
import { __ } from '~/locale';
|
|
||||||
import { isScrolledToBottom } from '~/lib/utils/scroll_utils';
|
import { isScrolledToBottom } from '~/lib/utils/scroll_utils';
|
||||||
|
|
||||||
export const headerActions = state => {
|
export const headerActions = () => [];
|
||||||
return [];
|
|
||||||
};
|
|
||||||
|
|
||||||
export const headerTime = state => (state.job.started ? state.job.started : state.job.created_at);
|
export const headerTime = state => (state.job.started ? state.job.started : state.job.created_at);
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
title: Move job cancel button
|
title: Move cancel & new issue button on job page
|
||||||
merge_request: 24074
|
merge_request: 24074
|
||||||
author:
|
author:
|
||||||
type: changed
|
type: changed
|
||||||
|
|
|
@ -191,7 +191,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
|
||||||
|
|
||||||
href = new_project_issue_path(project, options)
|
href = new_project_issue_path(project, options)
|
||||||
|
|
||||||
page.within('.header-action-buttons') do
|
page.within('.build-sidebar') do
|
||||||
expect(find('.js-new-issue')['href']).to include(href)
|
expect(find('.js-new-issue')['href']).to include(href)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -10,7 +10,7 @@ describe('Job Store Getters', () => {
|
||||||
|
|
||||||
describe('headerActions', () => {
|
describe('headerActions', () => {
|
||||||
describe('with new issue path', () => {
|
describe('with new issue path', () => {
|
||||||
it('returns an empty array', () => {
|
it('returns an empty array with no actions', () => {
|
||||||
localState.job.new_issue_path = 'issues/new';
|
localState.job.new_issue_path = 'issues/new';
|
||||||
|
|
||||||
expect(getters.headerActions(localState)).toEqual([]);
|
expect(getters.headerActions(localState)).toEqual([]);
|
||||||
|
|
Loading…
Reference in New Issue