diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-09-19 14:57:29 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-09-19 14:57:29 +0300 |
commit | 4bf599480642d12adf5f8fbc1bbc91241706977b (patch) | |
tree | d8ea30e98a0cd676a79f6055d7fbacd98b06f725 /spec/features | |
parent | c6660e61b267dafe7e4f6ce2b4e38b644e7b2177 (diff) | |
parent | 7f8a520f8ac269d4d75c6f5f8d2e858e69300c31 (diff) |
Merge branch 'dz-combine-green-buttons' into 'master'
Unite green buttons under one css class
See merge request gitlab-org/gitlab-ce!21795
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/dashboard/group_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/labels_hierarchy_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/merge_request/user_posts_notes_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/projects/members/invite_group_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/snippets/notes_on_personal_snippets_spec.rb | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/spec/features/dashboard/group_spec.rb b/spec/features/dashboard/group_spec.rb index 1c7932e7964..e57fcde8b2c 100644 --- a/spec/features/dashboard/group_spec.rb +++ b/spec/features/dashboard/group_spec.rb @@ -13,7 +13,7 @@ RSpec.describe 'Dashboard Group' do it 'creates new group', :js do visit dashboard_groups_path - find('.btn-new').click + find('.btn-success').click new_path = 'Samurai' new_description = 'Tokugawa Shogunate' diff --git a/spec/features/labels_hierarchy_spec.rb b/spec/features/labels_hierarchy_spec.rb index 6f917f522bc..09904cb907f 100644 --- a/spec/features/labels_hierarchy_spec.rb +++ b/spec/features/labels_hierarchy_spec.rb @@ -156,7 +156,7 @@ describe 'Labels Hierarchy', :js, :nested_groups do find('a.label-item', text: parent_group_label.title).click find('a.label-item', text: project_label_1.title).click - find('.btn-create').click + find('.btn-success').click expect(page.find('.issue-details h2.title')).to have_content('new created issue') expect(page).to have_selector('span.badge', text: grandparent_group_label.title) diff --git a/spec/features/merge_request/user_posts_notes_spec.rb b/spec/features/merge_request/user_posts_notes_spec.rb index 260c5f9c28b..ee5f5377ca6 100644 --- a/spec/features/merge_request/user_posts_notes_spec.rb +++ b/spec/features/merge_request/user_posts_notes_spec.rb @@ -111,7 +111,7 @@ describe 'Merge request > User posts notes', :js do it 'allows using markdown buttons after saving a note and then trying to edit it again' do page.within('.current-note-edit-form') do fill_in 'note[note]', with: 'This is the new content' - find('.btn-save').click + find('.btn-success').click end find('.note').hover @@ -129,7 +129,7 @@ describe 'Merge request > User posts notes', :js do it 'appends the edited at time to the note' do page.within('.current-note-edit-form') do fill_in 'note[note]', with: 'Some new content' - find('.btn-save').click + find('.btn-success').click end page.within("#note_#{note.id}") do diff --git a/spec/features/projects/members/invite_group_spec.rb b/spec/features/projects/members/invite_group_spec.rb index 0fb3eb20b5b..fceead0b45e 100644 --- a/spec/features/projects/members/invite_group_spec.rb +++ b/spec/features/projects/members/invite_group_spec.rb @@ -40,7 +40,7 @@ describe 'Project > Members > Invite group', :js do select2 group_to_share_with.id, from: '#link_group_id' page.find('body').click - find('.btn-create').click + find('.btn-success').click page.within('.project-members-groups') do expect(page).to have_content(group_to_share_with.name) @@ -122,7 +122,7 @@ describe 'Project > Members > Invite group', :js do fill_in 'expires_at_groups', with: (Time.now + 4.5.days).strftime('%Y-%m-%d') click_on 'invite-group-tab' - find('.btn-create').click + find('.btn-success').click end it 'the group link shows the expiration time with a warning class' do diff --git a/spec/features/snippets/notes_on_personal_snippets_spec.rb b/spec/features/snippets/notes_on_personal_snippets_spec.rb index 1442e011d52..eeacaf5f72a 100644 --- a/spec/features/snippets/notes_on_personal_snippets_spec.rb +++ b/spec/features/snippets/notes_on_personal_snippets_spec.rb @@ -103,7 +103,7 @@ describe 'Comments on personal snippets', :js do page.within('.current-note-edit-form') do fill_in 'note[note]', with: 'new content' - find('.btn-save').click + find('.btn-success').click end page.within("#notes-list li#note_#{snippet_notes[0].id}") do |