Fixed tests

2 files changed, 5 insertions, 7 deletions

diff --git a/features/steps/shared/issuable.rb b/features/steps/shared/issuable.rb
index 24b3fb6eacb..a58b3cb7e16 100644
--- a/features/steps/shared/issuable.rb
+++ b/features/steps/shared/issuable.rb
@@ -2,7 +2,7 @@ module SharedIssuable
   include Spinach::DSL
 
   def edit_issuable
-    find(:css, '.issuable-edit').click
+    find('.issuable-edit', visible: true).click
   end
 
   step 'project "Community" has "Community issue" open issue' do
diff --git a/spec/features/issues/move_spec.rb b/spec/features/issues/move_spec.rb
index 6fda0c31866..caa7b0ec48a 100644
--- a/spec/features/issues/move_spec.rb
+++ b/spec/features/issues/move_spec.rb
@@ -42,11 +42,9 @@ feature 'issue move to another project' do
 
       expect(current_url).to include project_path(new_project)
 
-      page.within('.issue') do
-        expect(page).to have_content("Text with #{cross_reference}!1")
-        expect(page).to have_content("Moved from #{cross_reference}#1")
-        expect(page).to have_content(issue.title)
-      end
+      expect(page).to have_content("Text with #{cross_reference}!1")
+      expect(page).to have_content("Moved from #{cross_reference}#1")
+      expect(page).to have_content(issue.title)
     end
 
     context 'projects user does not have permission to move issue to exist' do
@@ -74,7 +72,7 @@ feature 'issue move to another project' do
 
   def edit_issue(issue)
     visit issue_path(issue)
-    page.within('.issuable-header') { click_link 'Edit' }
+    page.within('.issuable-actions') { find('.issuable-edit').click }
   end
 
   def issue_path(issue)