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

Remove def project from tests that inherit it.

6 files changed, 0 insertions, 24 deletions

diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb
index 7fcca732626..1826ead1d51 100644
--- a/features/steps/dashboard/dashboard.rb
+++ b/features/steps/dashboard/dashboard.rb
@@ -82,8 +82,4 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
   step 'I should see 1 project at group list' do
     find('span.last_activity/span').should have_content('1')
   end
-
-  def project
-    @project ||= Project.find_by(name: "Shop")
-  end
 end
diff --git a/features/steps/project/forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb
index e8a6d635308..ccef84cdcc5 100644
--- a/features/steps/project/forked_merge_requests.rb
+++ b/features/steps/project/forked_merge_requests.rb
@@ -128,10 +128,6 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
     page.should have_select("merge_request_target_project_id", selected: project.path_with_namespace)
   end
 
-  def project
-    @project ||= Project.find_by!(name: "Shop")
-  end
-
   # Verify a link is generated against the correct project
   def verify_commit_link(container_div, container_project)
     # This should force a wait for the javascript to execute
diff --git a/features/steps/project/issues.rb b/features/steps/project/issues.rb
index 137eac33238..6d86c893044 100644
--- a/features/steps/project/issues.rb
+++ b/features/steps/project/issues.rb
@@ -236,8 +236,4 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
     # make sure AJAX request finished
     URI.parse(current_url).request_uri == project_issues_path(project, issue_search: text)
   end
-
-  def project
-    @project ||= Project.find_by(name: 'Shop')
-  end
 end
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index cd8475c14ac..0cc78f0f58d 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -261,10 +261,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     end
   end
 
-  def project
-    @project ||= Project.find_by!(name: "Shop")
-  end
-
   def merge_request
     @merge_request ||= MergeRequest.find_by!(title: "Bug NS-05")
   end
diff --git a/features/steps/project/snippets.rb b/features/steps/project/snippets.rb
index 2f8d3205d6c..4a39bfdbb79 100644
--- a/features/steps/project/snippets.rb
+++ b/features/steps/project/snippets.rb
@@ -89,10 +89,6 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
     visit project_snippet_path(project, project_snippet)
   end
 
-  def project
-    @project ||= Project.find_by!(name: "Shop")
-  end
-
   def project_snippet
     @project_snippet ||= ProjectSnippet.find_by!(title: "Snippet one")
   end
diff --git a/features/steps/search.rb b/features/steps/search.rb
index b1058989d0b..f3d8bd80f13 100644
--- a/features/steps/search.rb
+++ b/features/steps/search.rb
@@ -66,8 +66,4 @@ class Spinach::Features::Search < Spinach::FeatureSteps
   step 'I should not see "Bar" link' do
     page.should_not have_link "Bar"
   end
-
-  def project
-    @project ||= Project.find_by(name: "Shop")
-  end
 end