diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-10-17 02:21:28 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-10-17 11:18:17 -0500 |
commit | 7a3e605350fd501661d2cd0fe72440bf0773f4b7 (patch) | |
tree | 39d10a87baf9e80082ede3ff414e6c9ed9fc5c1b /spec/javascripts/vue_mr_widget/components | |
parent | 024c31fe79b0e4026c9bff0802424efe6e127a4c (diff) | |
download | gitlab-ce-7a3e605350fd501661d2cd0fe72440bf0773f4b7.tar.gz |
Resolve eslint violations
Diffstat (limited to 'spec/javascripts/vue_mr_widget/components')
7 files changed, 12 insertions, 0 deletions
diff --git a/spec/javascripts/vue_mr_widget/components/deployment_spec.js b/spec/javascripts/vue_mr_widget/components/deployment_spec.js index 5fda39ae775..20b5532a837 100644 --- a/spec/javascripts/vue_mr_widget/components/deployment_spec.js +++ b/spec/javascripts/vue_mr_widget/components/deployment_spec.js @@ -152,6 +152,7 @@ describe('Deployment component', () => { expect(el.querySelector('.js-deploy-meta').getAttribute('href')).toEqual( deploymentMockData.url, ); + expect(el.querySelector('.js-deploy-meta').innerText).toContain(deploymentMockData.name); }); @@ -159,6 +160,7 @@ describe('Deployment component', () => { expect(el.querySelector('.js-deploy-url').getAttribute('href')).toEqual( deploymentMockData.external_url, ); + expect(el.querySelector('.js-deploy-url').innerText).toContain('View app'); }); diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_author_time_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_author_time_spec.js index 818d831e706..787f44e478d 100644 --- a/spec/javascripts/vue_mr_widget/components/mr_widget_author_time_spec.js +++ b/spec/javascripts/vue_mr_widget/components/mr_widget_author_time_spec.js @@ -38,6 +38,7 @@ describe('MrWidgetAuthorTime', () => { expect(vm.$el.querySelector('time').getAttribute('data-original-title')).toEqual( '2017-03-23T23:02:00.807Z', ); + expect(vm.$el.querySelector('time').textContent.trim()).toEqual('12 hours ago'); }); }); diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js index 15c92dffe9c..02c476f2871 100644 --- a/spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js +++ b/spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js @@ -304,9 +304,11 @@ describe('MRWidgetHeader', () => { expect(vm.$el.querySelector('.diverged-commits-count').textContent).toEqual( 'The source branch is 12 commits behind the target branch', ); + expect(vm.$el.querySelector('.diverged-commits-count a').textContent).toEqual( '12 commits behind', ); + expect(vm.$el.querySelector('.diverged-commits-count a')).toHaveAttr( 'href', vm.mr.targetBranchPath, diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_merge_help_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_merge_help_spec.js index dd7137abe0c..2c554f3f3ab 100644 --- a/spec/javascripts/vue_mr_widget/components/mr_widget_merge_help_spec.js +++ b/spec/javascripts/vue_mr_widget/components/mr_widget_merge_help_spec.js @@ -36,6 +36,7 @@ describe('MRWidgetMergeHelp', () => { expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-target')).toEqual( '#modal_merge_info', ); + expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-toggle')).toEqual( 'modal', ); @@ -60,6 +61,7 @@ describe('MRWidgetMergeHelp', () => { expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-target')).toEqual( '#modal_merge_info', ); + expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-toggle')).toEqual( 'modal', ); diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js index 23c51aa1fb2..d46ad0acc9b 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js @@ -125,10 +125,12 @@ describe('MRWidgetMergeWhenPipelineSucceeds', () => { expect(vm.$el.querySelector('.js-cancel-auto-merge').innerText).toContain( 'Cancel automatic merge', ); + expect(vm.$el.querySelector('.js-cancel-auto-merge').getAttribute('disabled')).toBeFalsy(); expect(vm.$el.querySelector('.js-remove-source-branch').innerText).toContain( 'Remove source branch', ); + expect(vm.$el.querySelector('.js-remove-source-branch').getAttribute('disabled')).toBeFalsy(); }); diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js index 5b80f9b8380..babb8cea0ab 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js @@ -18,6 +18,7 @@ describe('NothingToMerge', () => { expect(vm.$el.innerText).toContain( "Currently there are no changes in this merge request's source branch", ); + expect(vm.$el.innerText).toContain('Please push new commits or use a different branch.'); }); diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js index d84fee247be..bd64d7b2926 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js @@ -23,6 +23,7 @@ describe('UnresolvedDiscussions', () => { expect(vm.$el.innerText).toContain( 'There are unresolved discussions. Please resolve these discussions', ); + expect(vm.$el.innerText).toContain('Create an issue to resolve them later'); expect(vm.$el.querySelector('.js-create-issue').getAttribute('href')).toEqual(gl.TEST_HOST); }); @@ -37,6 +38,7 @@ describe('UnresolvedDiscussions', () => { expect(vm.$el.innerText).toContain( 'There are unresolved discussions. Please resolve these discussions', ); + expect(vm.$el.querySelector('.js-create-issue')).toEqual(null); }); }); |