From f3465c72936c4ea3fee316a54991f67ac4723ab6 Mon Sep 17 00:00:00 2001 From: Fernando Arias Date: Thu, 10 Jan 2019 10:36:27 -0500 Subject: [PATCH] Update failing specs & linter errors & changelog --- app/assets/javascripts/jobs/store/getters.js | 5 +---- changelogs/unreleased/move-job-cancel-btn.yml | 2 +- spec/features/projects/jobs_spec.rb | 2 +- spec/javascripts/jobs/store/getters_spec.js | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/jobs/store/getters.js b/app/assets/javascripts/jobs/store/getters.js index a6c8459904f..5c87b76c94c 100644 --- a/app/assets/javascripts/jobs/store/getters.js +++ b/app/assets/javascripts/jobs/store/getters.js @@ -1,10 +1,7 @@ import _ from 'underscore'; -import { __ } from '~/locale'; import { isScrolledToBottom } from '~/lib/utils/scroll_utils'; -export const headerActions = state => { - return []; -}; +export const headerActions = () => []; export const headerTime = state => (state.job.started ? state.job.started : state.job.created_at); diff --git a/changelogs/unreleased/move-job-cancel-btn.yml b/changelogs/unreleased/move-job-cancel-btn.yml index 22fe38c0ddb..41f8e1be5f8 100644 --- a/changelogs/unreleased/move-job-cancel-btn.yml +++ b/changelogs/unreleased/move-job-cancel-btn.yml @@ -1,5 +1,5 @@ --- -title: Move job cancel button +title: Move cancel & new issue button on job page merge_request: 24074 author: type: changed diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index 60f37f4b74a..aff3ebaf632 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -191,7 +191,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do 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) end end diff --git a/spec/javascripts/jobs/store/getters_spec.js b/spec/javascripts/jobs/store/getters_spec.js index c40530d2f35..5319e90040f 100644 --- a/spec/javascripts/jobs/store/getters_spec.js +++ b/spec/javascripts/jobs/store/getters_spec.js @@ -10,7 +10,7 @@ describe('Job Store Getters', () => { describe('headerActions', () => { 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'; expect(getters.headerActions(localState)).toEqual([]);