Merge branch 'master' into rubocop-for-tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/issues_spec.rb
	spec/models/forked_project_link_spec.rb
	spec/models/hooks/service_hook_spec.rb
	spec/models/hooks/web_hook_spec.rb
	spec/models/project_services/hipchat_service_spec.rb
	spec/requests/api/project_members_spec.rb
	spec/requests/api/projects_spec.rb
	spec/requests/api/system_hooks_spec.rb
	spec/services/archive_repository_service_spec.rb
	spec/support/matchers.rb
	spec/tasks/gitlab/backup_rake_spec.rb

1 files changed, 8 insertions, 6 deletions

diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb
index b2675546a14..f6aabfefeff 100644
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
@@ -2,8 +2,10 @@ module SharedNote
   include Spinach::DSL
 
   step 'I delete a comment' do
-    find('.note').hover
-    find(".js-note-delete").click
+    page.within('.notes') do
+      find('.note').hover
+      find(".js-note-delete").click
+    end
   end
 
   step 'I haven\'t written any comment text' do
@@ -16,7 +18,6 @@ module SharedNote
     page.within(".js-main-target-form") do
       fill_in "note[note]", with: "XML attached"
       click_button "Add Comment"
-      sleep 0.05
     end
   end
 
@@ -123,13 +124,14 @@ module SharedNote
   end
 
   step 'I edit the last comment with a +1' do
-    find(".note").hover
-    find('.js-note-edit').click
+    page.within(".notes") do
+      find(".note").hover
+      find('.js-note-edit').click
+    end
 
     page.within(".current-note-edit-form") do
       fill_in 'note[note]', with: '+1 Awesome!'
       click_button 'Save Comment'
-      sleep 0.05
     end
   end