diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-14 18:11:18 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-14 18:11:18 +0000 |
| commit | 9cd5e0fc48c408f96a06c0a2b81bc70dfea9d98d (patch) | |
| tree | d91c32b693377454f9b184ede2da082ce0c5aad4 /features | |
| parent | 95a867e0af51370371cbe623b8851c2a3848f12f (diff) | |
| parent | a2931a392a4a96ad6df00c98578c193b91e4027f (diff) | |
| download | gitlab-ce-9cd5e0fc48c408f96a06c0a2b81bc70dfea9d98d.tar.gz | |
Merge branch 'subscribe-button-fix' into 'master'
Removed references to subscribe-button CSS class
These were being blocked by adblocks
Closes #15043
See merge request !3677
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/issues/issues.rb | 4 | ||||
| -rw-r--r-- | features/steps/project/labels.rb | 2 | ||||
| -rw-r--r-- | features/steps/project/merge_requests.rb | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb index aff5ca676be..fc12843ea5c 100644 --- a/features/steps/project/issues/issues.rb +++ b/features/steps/project/issues/issues.rb @@ -20,11 +20,11 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps end step 'I should see that I am subscribed' do - expect(find('.subscribe-button span')).to have_content 'Unsubscribe' + expect(find('.issuable-subscribe-button span')).to have_content 'Unsubscribe' end step 'I should see that I am unsubscribed' do - expect(find('.subscribe-button span')).to have_content 'Subscribe' + expect(find('.issuable-subscribe-button span')).to have_content 'Subscribe' end step 'I click link "Closed"' do diff --git a/features/steps/project/labels.rb b/features/steps/project/labels.rb index 17944527e3a..5bb02189021 100644 --- a/features/steps/project/labels.rb +++ b/features/steps/project/labels.rb @@ -29,6 +29,6 @@ class Spinach::Features::Labels < Spinach::FeatureSteps private def subscribe_button - first('.subscribe-button span') + first('.label-subscribe-button span') end end diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index f0af0d097fa..4f883fe7c27 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -77,11 +77,11 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'I should see that I am subscribed' do - expect(find('.subscribe-button span')).to have_content 'Unsubscribe' + expect(find('.issuable-subscribe-button span')).to have_content 'Unsubscribe' end step 'I should see that I am unsubscribed' do - expect(find('.subscribe-button span')).to have_content 'Subscribe' + expect(find('.issuable-subscribe-button span')).to have_content 'Subscribe' end step 'I click button "Unsubscribe"' do |