Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Arias <farias@gitlab.com>2018-12-31 05:05:24 +0300
committerFernando Arias <farias@gitlab.com>2019-01-10 17:04:17 +0300
commit42bfffc495f7347c5a60a61a88e525a596a49ffd (patch)
tree042a2f803c638e9c5549cdc0f985832df84ce85e /spec/javascripts/jobs
parentbe855cc6a2b85da2ec3e51e0f767099dc87991e6 (diff)
Move job cancel/new button
* Move cancel button to where the Retry is normally placed * Move new issue button to be in sidebar view for desktop versions * Update specs Add changelog entry for moving cancel btn Remove mobile version job action buttons * Remove buttons showing up on seperate row on job sidebar * Show Retry button in mobile version next to build name Improve flexbox usage for job action buttons * Allow for cleaner scaling of job name and alignment of buttons Adjust the debug button icon size * Adjust debug icon size on the build sidebar so the debug button is the same height as the other buttons Tweak job name vertical margins * Changes are only made to job side vue * Remove old class that only changed margin on top * Adjust veritcal margin uniformy set to 0 via bootstrap margin class Update Karma tests for job side view * Update karms tests for mobile version of side view * Removed tests for new issue button since we are fixing in https://gitlab.com/gitlab-org/gitlab-ce/issues/55944 Fix rspec and static-analysis failures * Run Prettier * Update rspec css selectors Move job action buttons to new line * Move "New Issue" and "Debug" buttons to seperate line in job sidebar * Update specs Run Prettier to format JS Remove New Issue button from job header Make sure button spacing follows styleguide
Diffstat (limited to 'spec/javascripts/jobs')
-rw-r--r--spec/javascripts/jobs/components/sidebar_spec.js4
-rw-r--r--spec/javascripts/jobs/store/getters_spec.js12
2 files changed, 4 insertions, 12 deletions
diff --git a/spec/javascripts/jobs/components/sidebar_spec.js b/spec/javascripts/jobs/components/sidebar_spec.js
index b0bc16d7c64..3a02351460c 100644
--- a/spec/javascripts/jobs/components/sidebar_spec.js
+++ b/spec/javascripts/jobs/components/sidebar_spec.js
@@ -28,7 +28,7 @@ describe('Sidebar details block', () => {
store,
});
- expect(vm.$el.querySelector('.js-retry-job')).toBeNull();
+ expect(vm.$el.querySelector('.js-retry-button')).toBeNull();
});
});
@@ -70,7 +70,7 @@ describe('Sidebar details block', () => {
});
it('should render link to retry job', () => {
- expect(vm.$el.querySelector('.js-retry-job').getAttribute('href')).toEqual(job.retry_path);
+ expect(vm.$el.querySelector('.js-retry-button').getAttribute('href')).toEqual(job.retry_path);
});
it('should render link to cancel job', () => {
diff --git a/spec/javascripts/jobs/store/getters_spec.js b/spec/javascripts/jobs/store/getters_spec.js
index 4195d9d3680..c40530d2f35 100644
--- a/spec/javascripts/jobs/store/getters_spec.js
+++ b/spec/javascripts/jobs/store/getters_spec.js
@@ -10,18 +10,10 @@ describe('Job Store Getters', () => {
describe('headerActions', () => {
describe('with new issue path', () => {
- it('returns an array with action to create a new issue', () => {
+ it('returns an empty array', () => {
localState.job.new_issue_path = 'issues/new';
- expect(getters.headerActions(localState)).toEqual([
- {
- label: 'New issue',
- path: localState.job.new_issue_path,
- cssClass:
- 'js-new-issue btn btn-success btn-inverted d-none d-md-block d-lg-block d-xl-block',
- type: 'link',
- },
- ]);
+ expect(getters.headerActions(localState)).toEqual([]);
});
});