move capybara scenarios to spec/features

18 files changed, 3 insertions, 1 deletions

diff --git a/spec/requests/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb
index bc0586b2712..bc0586b2712 100644
--- a/spec/requests/admin/admin_hooks_spec.rb
+++ b/spec/features/admin/admin_hooks_spec.rb
diff --git a/spec/requests/admin/admin_projects_spec.rb b/spec/features/admin/admin_projects_spec.rb
index c9ddf1f4534..c9ddf1f4534 100644
--- a/spec/requests/admin/admin_projects_spec.rb
+++ b/spec/features/admin/admin_projects_spec.rb
diff --git a/spec/requests/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index 455caf4a376..455caf4a376 100644
--- a/spec/requests/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
diff --git a/spec/requests/admin/security_spec.rb b/spec/features/admin/security_spec.rb
index 6306832628b..6306832628b 100644
--- a/spec/requests/admin/security_spec.rb
+++ b/spec/features/admin/security_spec.rb
diff --git a/spec/requests/atom/dashboard_issues_spec.rb b/spec/features/atom/dashboard_issues_spec.rb
index 6f5d51d16b6..6f5d51d16b6 100644
--- a/spec/requests/atom/dashboard_issues_spec.rb
+++ b/spec/features/atom/dashboard_issues_spec.rb
diff --git a/spec/requests/atom/dashboard_spec.rb b/spec/features/atom/dashboard_spec.rb
index 6257ad5c895..6257ad5c895 100644
--- a/spec/requests/atom/dashboard_spec.rb
+++ b/spec/features/atom/dashboard_spec.rb
diff --git a/spec/requests/atom/issues_spec.rb b/spec/features/atom/issues_spec.rb
index 0488c1f2266..0488c1f2266 100644
--- a/spec/requests/atom/issues_spec.rb
+++ b/spec/features/atom/issues_spec.rb
diff --git a/spec/requests/gitlab_flavored_markdown_spec.rb b/spec/features/gitlab_flavored_markdown_spec.rb
index 9a568511fa0..9a568511fa0 100644
--- a/spec/requests/gitlab_flavored_markdown_spec.rb
+++ b/spec/features/gitlab_flavored_markdown_spec.rb
diff --git a/spec/requests/issues_spec.rb b/spec/features/issues_spec.rb
index 6fff59f036f..6fff59f036f 100644
--- a/spec/requests/issues_spec.rb
+++ b/spec/features/issues_spec.rb
diff --git a/spec/requests/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 0111cf42ac7..37fc85c87f8 100644
--- a/spec/requests/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -97,7 +97,9 @@ describe "On a merge request diff", js: true, focus: true do
 
     visit diffs_project_merge_request_path(project, merge_request)
 
-    click_link("Diff")
+    within '.diffs-tab' do
+      click_link("Diff")
+    end
   end
 
   subject { page }
diff --git a/spec/requests/notes_on_wall_spec.rb b/spec/features/notes_on_wall_spec.rb
index 4adcf74e0b6..4adcf74e0b6 100644
--- a/spec/requests/notes_on_wall_spec.rb
+++ b/spec/features/notes_on_wall_spec.rb
diff --git a/spec/requests/profile_spec.rb b/spec/features/profile_spec.rb
index c18d8f921a3..c18d8f921a3 100644
--- a/spec/requests/profile_spec.rb
+++ b/spec/features/profile_spec.rb
diff --git a/spec/requests/projects_deploy_keys_spec.rb b/spec/features/projects_deploy_keys_spec.rb
index 25b1da9ebd8..25b1da9ebd8 100644
--- a/spec/requests/projects_deploy_keys_spec.rb
+++ b/spec/features/projects_deploy_keys_spec.rb
diff --git a/spec/requests/projects_spec.rb b/spec/features/projects_spec.rb
index 7bc48260935..7bc48260935 100644
--- a/spec/requests/projects_spec.rb
+++ b/spec/features/projects_spec.rb
diff --git a/spec/requests/search_spec.rb b/spec/features/search_spec.rb
index e338f359f88..e338f359f88 100644
--- a/spec/requests/search_spec.rb
+++ b/spec/features/search_spec.rb
diff --git a/spec/requests/security/profile_access_spec.rb b/spec/features/security/profile_access_spec.rb
index f854f3fb066..f854f3fb066 100644
--- a/spec/requests/security/profile_access_spec.rb
+++ b/spec/features/security/profile_access_spec.rb
diff --git a/spec/requests/security/project_access_spec.rb b/spec/features/security/project_access_spec.rb
index a35175102ec..a35175102ec 100644
--- a/spec/requests/security/project_access_spec.rb
+++ b/spec/features/security/project_access_spec.rb
diff --git a/spec/requests/snippets_spec.rb b/spec/features/snippets_spec.rb
index 770e34dc07c..770e34dc07c 100644
--- a/spec/requests/snippets_spec.rb
+++ b/spec/features/snippets_spec.rb