1 files changed, 7 insertions, 0 deletions
diff --git a/features/steps/project/project_fork.rb b/features/steps/project/project_fork.rb
index 775af0c5c58..4aa1e44b91e 100644
--- a/features/steps/project/project_fork.rb
+++ b/features/steps/project/project_fork.rb
@@ -4,6 +4,8 @@ class ForkProject < Spinach::FeatureSteps
   include SharedProject
 
   step 'I click link "Fork"' do
+    page.should have_content "Shop"
+    page.should have_content "Fork"
     Gitlab::Shell.any_instance.stub(:fork_repository).and_return(true)
     click_link "Fork"
   end
@@ -14,12 +16,17 @@ class ForkProject < Spinach::FeatureSteps
     @project.team << [@user, :reporter]
   end
 
+
   step 'I should see the forked project page' do
     page.should have_content "Project was successfully forked."
     current_path.should include current_user.namespace.path
+    @forked_project = Project.find_by_namespace_id(current_user.namespace.path)
   end
 
   step 'I already have a project named "Shop" in my namespace' do
+    current_user.namespace ||= create(:namespace)
+    current_user.namespace.should_not be_nil
+    current_user.namespace.path.should_not be_nil
     @my_project = create(:project_with_code, name: "Shop", namespace: current_user.namespace)
   end