Lets fix tests

4 files changed, 13 insertions, 8 deletions

diff --git a/features/project/team_management.feature b/features/project/team_management.feature
index fc353424e36..e153978e043 100644
--- a/features/project/team_management.feature
+++ b/features/project/team_management.feature
@@ -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"
diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb
index c6832056435..329571ac6ef 100644
--- a/features/steps/dashboard/dashboard.rb
+++ b/features/steps/dashboard/dashboard.rb
@@ -29,7 +29,7 @@ class Dashboard < 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 < 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 < 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 < 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
diff --git a/features/steps/project/project_team_management.rb b/features/steps/project/project_team_management.rb
index af41fd42612..93ba1086f6e 100644
--- a/features/steps/project/project_team_management.rb
+++ b/features/steps/project/project_team_management.rb
@@ -79,7 +79,7 @@ class ProjectTeamManagement < 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 < 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
 
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index 44f9d390cb1..66553e1e089 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -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