Commit 5b5912f9 authored by Robert Schilling's avatar Robert Schilling

Merge pull request #7889 from cirosantilli/rm-def-project

Remove def project from tests that inherit it.
parents efcac2be a92f48f6
...@@ -82,8 +82,4 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps ...@@ -82,8 +82,4 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
step 'I should see 1 project at group list' do step 'I should see 1 project at group list' do
find('span.last_activity/span').should have_content('1') find('span.last_activity/span').should have_content('1')
end end
def project
@project ||= Project.find_by(name: "Shop")
end
end end
...@@ -128,10 +128,6 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps ...@@ -128,10 +128,6 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
page.should have_select("merge_request_target_project_id", selected: project.path_with_namespace) page.should have_select("merge_request_target_project_id", selected: project.path_with_namespace)
end end
def project
@project ||= Project.find_by!(name: "Shop")
end
# Verify a link is generated against the correct project # Verify a link is generated against the correct project
def verify_commit_link(container_div, container_project) def verify_commit_link(container_div, container_project)
# This should force a wait for the javascript to execute # This should force a wait for the javascript to execute
......
...@@ -236,8 +236,4 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps ...@@ -236,8 +236,4 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
# make sure AJAX request finished # make sure AJAX request finished
URI.parse(current_url).request_uri == project_issues_path(project, issue_search: text) URI.parse(current_url).request_uri == project_issues_path(project, issue_search: text)
end end
def project
@project ||= Project.find_by(name: 'Shop')
end
end end
...@@ -261,10 +261,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps ...@@ -261,10 +261,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end end
end end
def project
@project ||= Project.find_by!(name: "Shop")
end
def merge_request def merge_request
@merge_request ||= MergeRequest.find_by!(title: "Bug NS-05") @merge_request ||= MergeRequest.find_by!(title: "Bug NS-05")
end end
......
...@@ -89,10 +89,6 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps ...@@ -89,10 +89,6 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
visit project_snippet_path(project, project_snippet) visit project_snippet_path(project, project_snippet)
end end
def project
@project ||= Project.find_by!(name: "Shop")
end
def project_snippet def project_snippet
@project_snippet ||= ProjectSnippet.find_by!(title: "Snippet one") @project_snippet ||= ProjectSnippet.find_by!(title: "Snippet one")
end end
......
...@@ -66,8 +66,4 @@ class Spinach::Features::Search < Spinach::FeatureSteps ...@@ -66,8 +66,4 @@ class Spinach::Features::Search < Spinach::FeatureSteps
step 'I should not see "Bar" link' do step 'I should not see "Bar" link' do
page.should_not have_link "Bar" page.should_not have_link "Bar"
end end
def project
@project ||= Project.find_by(name: "Shop")
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment