summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-08-21 23:27:03 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-08-21 23:27:03 -0700
commitd862ebd3b340d46937e0bf37c382fd93056b238e (patch)
tree1fe33e684035a3a55cd5f500351b980ff6bd4a2d
parent3784f134f1b2a34ce751bba0caf423d2779e604f (diff)
parent6baf9c441d7051276b5bfdbe43499d74d3acc65d (diff)
downloadgitlab-ce-d862ebd3b340d46937e0bf37c382fd93056b238e.tar.gz
Merge pull request #1266 from tsigo/cucumber_speedup
Speed up the "Project Network Graph" cucumber feature
-rw-r--r--features/projects/network.feature4
-rw-r--r--features/step_definitions/project/projects_steps.rb9
-rw-r--r--features/support/env.rb2
3 files changed, 10 insertions, 5 deletions
diff --git a/features/projects/network.feature b/features/projects/network.feature
index 9655184cfe1..61c05eb367e 100644
--- a/features/projects/network.feature
+++ b/features/projects/network.feature
@@ -4,9 +4,7 @@ Feature: Project Network Graph
Background:
Given I signin as a user
And I own project "Shop"
- And I visit project "Shop" network page
+ And I visit project "Shop" network page
Scenario: I should see project network
Then page should have network graph
-
-
diff --git a/features/step_definitions/project/projects_steps.rb b/features/step_definitions/project/projects_steps.rb
index c9af346e7cf..3ff08d58448 100644
--- a/features/step_definitions/project/projects_steps.rb
+++ b/features/step_definitions/project/projects_steps.rb
@@ -57,6 +57,11 @@ end
Given /^I visit project "(.*?)" network page$/ do |arg1|
project = Project.find_by_name(arg1)
+
+ # Stub out find_all to speed this up (10 commits vs. 650)
+ commits = Grit::Commit.find_all(project.repo, nil, {max_count: 10})
+ Grit::Commit.stub(:find_all).and_return(commits)
+
visit graph_project_path(project)
end
@@ -67,8 +72,8 @@ end
Given /^page should have network graph$/ do
page.should have_content "Project Network Graph"
within ".graph" do
- page.should have_content "stable"
- page.should have_content "notes_refacto..."
+ page.should have_content "master"
+ page.should have_content "scss_refactor..."
end
end
diff --git a/features/support/env.rb b/features/support/env.rb
index 496f23f9894..78d829c1a2f 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -44,3 +44,5 @@ require 'headless'
headless = Headless.new
headless.start
+
+require 'cucumber/rspec/doubles'