summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-05-10 12:22:56 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-05-10 12:22:56 -0700
commitbed783ac15453f60651f861803bba93c622625ba (patch)
treed560107fff213edcc6abb51f215a029b1e5fd740 /spec
parente42f7e2a5a733d7c3682bd7d15e509e1943003bc (diff)
downloadgitlab-ce-bed783ac15453f60651f861803bba93c622625ba.tar.gz
Rename btn-secondary to btn-default
Diffstat (limited to 'spec')
-rw-r--r--spec/features/merge_request/user_sees_versions_spec.rb12
-rw-r--r--spec/features/projects/pipelines/pipelines_spec.rb2
-rw-r--r--spec/javascripts/boards/board_new_issue_spec.js2
-rw-r--r--spec/javascripts/issue_show/components/edit_actions_spec.js2
4 files changed, 9 insertions, 9 deletions
diff --git a/spec/features/merge_request/user_sees_versions_spec.rb b/spec/features/merge_request/user_sees_versions_spec.rb
index 046bc0e6ff8..3a15d70979a 100644
--- a/spec/features/merge_request/user_sees_versions_spec.rb
+++ b/spec/features/merge_request/user_sees_versions_spec.rb
@@ -54,7 +54,7 @@ describe 'Merge request > User sees versions', :js do
describe 'switch between versions' do
before do
page.within '.mr-version-dropdown' do
- find('.btn-secondary').click
+ find('.btn-default').click
click_link 'version 1'
end
@@ -93,7 +93,7 @@ describe 'Merge request > User sees versions', :js do
describe 'compare with older version' do
before do
page.within '.mr-version-compare-dropdown' do
- find('.btn-secondary').click
+ find('.btn-default').click
click_link 'version 1'
end
@@ -151,7 +151,7 @@ describe 'Merge request > User sees versions', :js do
describe 'compare with same version' do
before do
page.within '.mr-version-compare-dropdown' do
- find('.btn-secondary').click
+ find('.btn-default').click
click_link 'version 1'
end
end
@@ -162,7 +162,7 @@ describe 'Merge request > User sees versions', :js do
end
page.within '.mr-version-dropdown' do
- find('.btn-secondary').click
+ find('.btn-default').click
click_link 'version 1'
end
expect(page).to have_content '0 changed files'
@@ -172,7 +172,7 @@ describe 'Merge request > User sees versions', :js do
describe 'compare with newer version' do
before do
page.within '.mr-version-compare-dropdown' do
- find('.btn-secondary').click
+ find('.btn-default').click
click_link 'version 2'
end
end
@@ -183,7 +183,7 @@ describe 'Merge request > User sees versions', :js do
end
page.within '.mr-version-dropdown' do
- find('.btn-secondary').click
+ find('.btn-default').click
click_link 'version 1'
end
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index d66ad6ab7f6..90e28483c6c 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -211,7 +211,7 @@ describe 'Pipelines', :js do
end
it 'has a dropdown with play button' do
- expect(page).to have_selector('.dropdown-new.btn.btn-secondary .icon-play')
+ expect(page).to have_selector('.dropdown-new.btn.btn-default .icon-play')
end
it 'has link to the manual action' do
diff --git a/spec/javascripts/boards/board_new_issue_spec.js b/spec/javascripts/boards/board_new_issue_spec.js
index 3077feb90bd..d5fbfdeaa91 100644
--- a/spec/javascripts/boards/board_new_issue_spec.js
+++ b/spec/javascripts/boards/board_new_issue_spec.js
@@ -93,7 +93,7 @@ describe('Issue boards new issue form', () => {
});
it('clears title after clicking cancel', (done) => {
- vm.$el.querySelector('.btn-secondary').click();
+ vm.$el.querySelector('.btn-default').click();
Vue.nextTick()
.then(() => {
diff --git a/spec/javascripts/issue_show/components/edit_actions_spec.js b/spec/javascripts/issue_show/components/edit_actions_spec.js
index 3cdbc13101a..d779ab7bb31 100644
--- a/spec/javascripts/issue_show/components/edit_actions_spec.js
+++ b/spec/javascripts/issue_show/components/edit_actions_spec.js
@@ -106,7 +106,7 @@ describe('Edit Actions components', () => {
describe('closeForm', () => {
it('emits close.form when clicking cancel', () => {
- vm.$el.querySelector('.btn-secondary').click();
+ vm.$el.querySelector('.btn-default').click();
expect(
eventHub.$emit,