Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-31 23:34:37 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-31 23:34:37 +0400
commitfaaedbf0514f14d7f7341d72b507f541efbc5d26 (patch)
treeb06cd39c44db37a59e3a385de16a5c4de07789f5 /features
parent3a017a4e3cfeefce562429eb19b132612bf8f63c (diff)
Fix network tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-rw-r--r--features/project/network.feature24
-rw-r--r--features/steps/project/network_graph.rb40
2 files changed, 32 insertions, 32 deletions
diff --git a/features/project/network.feature b/features/project/network.feature
index 22beb1c50bc..8beb6043aff 100644
--- a/features/project/network.feature
+++ b/features/project/network.feature
@@ -12,28 +12,28 @@ Feature: Project Network Graph
@javascript
Scenario: I should switch "branch" and "tag"
- When I switch ref to "stable"
- Then page should select "stable" in select box
- And page should have "stable" on graph
- When I switch ref to "v2.1.0"
- Then page should select "v2.1.0" in select box
- And page should have "v2.1.0" on graph
+ When I switch ref to "feature"
+ Then page should select "feature" in select box
+ And page should have "feature" on graph
+ When I switch ref to "v1.0.0"
+ Then page should select "v1.0.0" in select box
+ And page should have "v1.0.0" on graph
@javascript
Scenario: I should looking for a commit by SHA
- When I looking for a commit by SHA of "v2.1.0"
+ When I looking for a commit by SHA of "v1.0.0"
Then page should have network graph
And page should select "master" in select box
- And page should have "v2.1.0" on graph
+ And page should have "v1.0.0" on graph
@javascript
Scenario: I should filter selected tag
- When I switch ref to "v2.1.0"
- Then page should have content not containing "v2.1.0"
+ When I switch ref to "v1.0.0"
+ Then page should have content not containing "v1.0.0"
When click "Show only selected branch" checkbox
- Then page should not have content not containing "v2.1.0"
+ Then page should not have content not containing "v1.0.0"
When click "Show only selected branch" checkbox
- Then page should have content not containing "v2.1.0"
+ Then page should have content not containing "v1.0.0"
Scenario: I should fail to look for a commit
When I look for a commit by ";"
diff --git a/features/steps/project/network_graph.rb b/features/steps/project/network_graph.rb
index 1c5cfcc6c68..9f5da288914 100644
--- a/features/steps/project/network_graph.rb
+++ b/features/steps/project/network_graph.rb
@@ -19,8 +19,8 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
page.should have_selector '.select2-chosen', text: "master"
end
- And 'page should select "v2.1.0" in select box' do
- page.should have_selector '.select2-chosen', text: "v2.1.0"
+ And 'page should select "v1.0.0" in select box' do
+ page.should have_selector '.select2-chosen', text: "v1.0.0"
end
And 'page should have "master" on graph' do
@@ -29,13 +29,13 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
end
end
- When 'I switch ref to "stable"' do
- page.select 'stable', from: 'ref'
+ When 'I switch ref to "feature"' do
+ page.select 'feature', from: 'ref'
sleep 2
end
- When 'I switch ref to "v2.1.0"' do
- page.select 'v2.1.0', from: 'ref'
+ When 'I switch ref to "v1.0.0"' do
+ page.select 'v1.0.0', from: 'ref'
sleep 2
end
@@ -44,43 +44,43 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
sleep 2
end
- Then 'page should have content not containing "v2.1.0"' do
+ Then 'page should have content not containing "v1.0.0"' do
within '.network-graph' do
- page.should have_content 'cleaning'
+ page.should have_content 'Change some files'
end
end
- Then 'page should not have content not containing "v2.1.0"' do
+ Then 'page should not have content not containing "v1.0.0"' do
within '.network-graph' do
- page.should_not have_content 'cleaning'
+ page.should_not have_content 'Change some files'
end
end
- And 'page should select "stable" in select box' do
- page.should have_selector '.select2-chosen', text: "stable"
+ And 'page should select "feature" in select box' do
+ page.should have_selector '.select2-chosen', text: "feature"
end
- And 'page should select "v2.1.0" in select box' do
- page.should have_selector '.select2-chosen', text: "v2.1.0"
+ And 'page should select "v1.0.0" in select box' do
+ page.should have_selector '.select2-chosen', text: "v1.0.0"
end
- And 'page should have "stable" on graph' do
+ And 'page should have "feature" on graph' do
within '.network-graph' do
- page.should have_content 'stable'
+ page.should have_content 'feature'
end
end
- When 'I looking for a commit by SHA of "v2.1.0"' do
+ When 'I looking for a commit by SHA of "v1.0.0"' do
within ".network-form" do
- fill_in 'extended_sha1', with: '98d6492'
+ fill_in 'extended_sha1', with: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9'
find('button').click
end
sleep 2
end
- And 'page should have "v2.1.0" on graph' do
+ And 'page should have "v1.0.0" on graph' do
within '.network-graph' do
- page.should have_content 'v2.1.0'
+ page.should have_content 'v1.0.0'
end
end