Merge branch 'master' into 4009-external-users4009-external-users

3 files changed, 55 insertions, 4 deletions

diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index 135e1d016ae..ce2554bc80d 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -13,7 +13,6 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
       thumbsup = page.first('.award-control')
       thumbsup.click
       thumbsup.hover
-      sleep 0.3
     end
   end
 
@@ -46,12 +45,10 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
   end
 
   step 'I have award added' do
-    sleep 0.2
-
     page.within '.awards' do
       expect(page).to have_selector '.js-emoji-btn'
       expect(page.find('.js-emoji-btn.active .js-counter')).to have_content '1'
-      expect(page.find('.js-emoji-btn.active')['data-original-title']).to eq('me')
+      expect(page).to have_css(".js-emoji-btn.active[data-original-title='me']")
     end
   end
 
diff --git a/features/steps/project/labels.rb b/features/steps/project/labels.rb
new file mode 100644
index 00000000000..17944527e3a
--- /dev/null
+++ b/features/steps/project/labels.rb
@@ -0,0 +1,34 @@
+class Spinach::Features::Labels < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedIssuable
+  include SharedProject
+  include SharedNote
+  include SharedPaths
+  include SharedMarkdown
+
+  step 'And I visit project "Shop" labels page' do
+    visit namespace_project_labels_path(project.namespace, project)
+  end
+
+  step 'I should see that I am subscribed to the "bug" label' do
+    expect(subscribe_button).to have_content 'Unsubscribe'
+  end
+
+  step 'I should see that I am not subscribed to the "bug" label' do
+    expect(subscribe_button).to have_content 'Subscribe'
+  end
+
+  step 'I click button "Unsubscribe" for the "bug" label' do
+    subscribe_button.click
+  end
+
+  step 'I click button "Subscribe" for the "bug" label' do
+    subscribe_button.click
+  end
+
+  private
+
+  def subscribe_button
+    first('.subscribe-button span')
+  end
+end
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index df4259b9ddf..91fe19dd477 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -16,10 +16,18 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     click_link "Bug NS-04"
   end
 
+  step 'I click link "Feature NS-05"' do
+    click_link "Feature NS-05"
+  end
+
   step 'I click link "All"' do
     click_link "All"
   end
 
+  step 'I click link "Merged"' do
+    click_link "Merged"
+  end
+
   step 'I click link "Closed"' do
     click_link "Closed"
   end
@@ -40,6 +48,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     expect(page).to have_content "Bug NS-04"
   end
 
+  step 'I should see merge request "Feature NS-05"' do
+    expect(page).to have_content "Feature NS-05"
+  end
+
   step 'I should not see "master" branch' do
     expect(find('.merge-request-info')).not_to have_content "master"
   end
@@ -120,6 +132,14 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
            author: project.users.first)
   end
 
+  step 'project "Shop" have "Feature NS-05" merged merge request' do
+    create(:merged_merge_request,
+           title: "Feature NS-05",
+           source_project: project,
+           target_project: project,
+           author: project.users.first)
+  end
+
   step 'project "Shop" have "Bug NS-07" open merge request with rebased branch' do
     create(:merge_request, :rebased,
       title: "Bug NS-07",