Lets fix tests

Dmitriy Zaporozhets
1 parent e45179c9
Showing 5 changed files with 14 additions and 9 deletions Show diff stats
app/views/snippets/_snippets.html.haml
features/project/team_management.feature
features/steps/dashboard/dashboard.rb
features/steps/project/project_team_management.rb
features/steps/shared/project.rb
 %ul.bordered-list
-  = render @snippets
+  = render partial: 'snippet', collection: @snippets
   - if @snippets.empty?
     %li
       %h3.nothing_here_message Nothing here.
@@ -31,6 +31,7 @@ Feature: Project Team management
   Scenario: Import team from another project
     Given I own project "Website"
     And "Mike" is "Website" reporter
+    When I visit project "Shop" team page
     And I click link "Import team from another project"
-    When I submit "Website" project for import team
+    And I submit "Website" project for import team
     Then I should see "Mike" in team list as "Reporter"
@@ -29,7 +29,7 @@ class Dashboard &lt; Spinach::FeatureSteps
   Given 'user with name "John Doe" joined project "Shop"' do
     user = create(:user, {name: "John Doe"})
-    project = Project.find_by_name "Shop"
+    project.team << [user, :master]
     Event.create(
       project: project,
       author_id: user.id,
@@ -38,12 +38,11 @@ class Dashboard &lt; Spinach::FeatureSteps
   end
   Then 'I should see "John Doe joined project at Shop" event' do
-    page.should have_content "John Doe joined project at Shop"
+    page.should have_content "John Doe joined project at #{project.name_with_namespace}"
   end
   And 'user with name "John Doe" left project "Shop"' do
     user = User.find_by_name "John Doe"
-    project = Project.find_by_name "Shop"
     Event.create(
       project: project,
       author_id: user.id,
@@ -52,7 +51,7 @@ class Dashboard &lt; Spinach::FeatureSteps
   end
   Then 'I should see "John Doe left project at Shop" event' do
-    page.should have_content "John Doe left project at Shop"
+    page.should have_content "John Doe left project at #{project.name_with_namespace}"
   end
   And 'I have group with projects' do
@@ -83,4 +82,8 @@ class Dashboard &lt; Spinach::FeatureSteps
   Then 'I should see 1 project at group list' do
     page.find('span.last_activity/span').should have_content('1')
   end
+
+  def project
+    @project ||= Project.find_by_name "Shop"
+  end
 end
@@ -79,7 +79,7 @@ class ProjectTeamManagement &lt; Spinach::FeatureSteps
   end
   Given 'I own project "Website"' do
-    @project = create(:project, name: "Website")
+    @project = create(:project, name: "Website", namespace: @user.namespace)
     @project.team << [@user, :master]
   end
@@ -94,7 +94,8 @@ class ProjectTeamManagement &lt; Spinach::FeatureSteps
   end
   When 'I submit "Website" project for import team' do
-    select 'Website', from: 'source_project_id'
+    project = Project.find_by_name("Website")
+    select project.name_with_namespace, from: 'source_project_id'
     click_button 'Import'
   end
@@ -42,7 +42,7 @@ module SharedProject
   Then 'I should see project "Shop" activity feed' do
     project = Project.find_by_name("Shop")
-    page.should have_content "#{@user.name} pushed new branch new_design at #{project.name}"
+    page.should have_content "#{@user.name} pushed new branch new_design at #{project.name_with_namespace}"
   end
   Then 'I should see project settings' do
1	%ul.bordered-list	1	%ul.bordered-list
2	- = render @snippets	2	+ = render partial: 'snippet', collection: @snippets
3	- if @snippets.empty?	3	- if @snippets.empty?
4	%li	4	%li
5	%h3.nothing_here_message Nothing here.	5	%h3.nothing_here_message Nothing here.
	@@ -42,7 +42,7 @@ module SharedProject		@@ -42,7 +42,7 @@ module SharedProject
42		42
43	Then 'I should see project "Shop" activity feed' do	43	Then 'I should see project "Shop" activity feed' do
44	project = Project.find_by_name("Shop")	44	project = Project.find_by_name("Shop")
45	- page.should have_content "#{@user.name} pushed new branch new_design at #{project.name}"	45	+ page.should have_content "#{@user.name} pushed new branch new_design at #{project.name_with_namespace}"
46	end	46	end
47		47
48	Then 'I should see project settings' do	48	Then 'I should see project settings' do