remove duplicate finder in features/steps/path

Dmitriy Zaporozhets
1 parent c3659ef2
Showing 1 changed file with 9 additions and 9 deletions Show diff stats
features/steps/shared/paths.rb
@@ -173,12 +173,10 @@ module SharedPaths
   # ----------------------------------------
  
   And 'I visit project "Shop" page' do
-    project = Project.find_by_name("Shop")
     visit project_path(project)
   end
  
   When 'I visit edit project "Shop" page' do
-    project = Project.find_by_name("Shop")
     visit edit_project_path(project)
   end
  
@@ -219,7 +217,7 @@ module SharedPaths
   end
  
   And 'I visit project "Shop" issues page' do
-    visit project_issues_path(Project.find_by_name("Shop"))
+    visit project_issues_path(project)
   end
  
   Given 'I visit issue page "Release 0.4"' do
@@ -228,7 +226,7 @@ module SharedPaths
   end
  
   Given 'I visit project "Shop" labels page' do
-    visit project_labels_path(Project.find_by_name("Shop"))
+    visit project_labels_path(project)
   end
  
   Given 'I visit merge request page "Bug NS-04"' do
@@ -242,20 +240,18 @@ module SharedPaths
   end
  
   And 'I visit project "Shop" merge requests page' do
-    visit project_merge_requests_path(Project.find_by_name("Shop"))
+    visit project_merge_requests_path(project)
   end
  
   Given 'I visit project "Shop" milestones page' do
-    @project = Project.find_by_name("Shop")
-    visit project_milestones_path(@project)
+    visit project_milestones_path(project)
   end
  
   Then 'I visit project "Shop" team page' do
-    visit project_team_index_path(Project.find_by_name("Shop"))
+    visit project_team_index_path(project)
   end
  
   Then 'I visit project "Shop" wall page' do
-    project = Project.find_by_name("Shop")
     visit wall_project_path(project)
   end
  
@@ -266,4 +262,8 @@ module SharedPaths
   def root_ref
     @project.repository.root_ref
   end
+
+  def project
+    project = Project.find_by_name!("Shop")
+  end
 end
...	...	@@ -173,12 +173,10 @@ module SharedPaths
173	173	# ----------------------------------------
174	174
175	175	And 'I visit project "Shop" page' do
176		- project = Project.find_by_name("Shop")
177	176	visit project_path(project)
178	177	end
179	178
180	179	When 'I visit edit project "Shop" page' do
181		- project = Project.find_by_name("Shop")
182	180	visit edit_project_path(project)
183	181	end
184	182
...	...	@@ -219,7 +217,7 @@ module SharedPaths
219	217	end
220	218
221	219	And 'I visit project "Shop" issues page' do
222		- visit project_issues_path(Project.find_by_name("Shop"))
	220	+ visit project_issues_path(project)
223	221	end
224	222
225	223	Given 'I visit issue page "Release 0.4"' do
...	...	@@ -228,7 +226,7 @@ module SharedPaths
228	226	end
229	227
230	228	Given 'I visit project "Shop" labels page' do
231		- visit project_labels_path(Project.find_by_name("Shop"))
	229	+ visit project_labels_path(project)
232	230	end
233	231
234	232	Given 'I visit merge request page "Bug NS-04"' do
...	...	@@ -242,20 +240,18 @@ module SharedPaths
242	240	end
243	241
244	242	And 'I visit project "Shop" merge requests page' do
245		- visit project_merge_requests_path(Project.find_by_name("Shop"))
	243	+ visit project_merge_requests_path(project)
246	244	end
247	245
248	246	Given 'I visit project "Shop" milestones page' do
249		- @project = Project.find_by_name("Shop")
250		- visit project_milestones_path(@project)
	247	+ visit project_milestones_path(project)
251	248	end
252	249
253	250	Then 'I visit project "Shop" team page' do
254		- visit project_team_index_path(Project.find_by_name("Shop"))
	251	+ visit project_team_index_path(project)
255	252	end
256	253
257	254	Then 'I visit project "Shop" wall page' do
258		- project = Project.find_by_name("Shop")
259	255	visit wall_project_path(project)
260	256	end
261	257
...	...	@@ -266,4 +262,8 @@ module SharedPaths
266	262	def root_ref
267	263	@project.repository.root_ref
268	264	end
	265	+
	266	+ def project
	267	+ project = Project.find_by_name!("Shop")
	268	+ end
269	269	end
...	...