diff options
author | Robert Speicher <robert@gitlab.com> | 2016-03-14 15:14:49 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-03-14 15:14:49 +0000 |
commit | a6cef2370b1b50766ba5f704d3b3ec4f88714d80 (patch) | |
tree | b33b3d2a4fc1a54bbffa2fcff993e4dce81ca838 /features | |
parent | 37ba5a12b515172b76d28e112ab9899823163717 (diff) | |
parent | f0c73a5bdbbf07c6668b9ee50f38ba4f4813eabd (diff) | |
download | gitlab-ce-a6cef2370b1b50766ba5f704d3b3ec4f88714d80.tar.gz |
Merge branch 'remove-sleeps-from-network-graph-spec' into 'master'
Remove sleeps from network graph feature spec
Also removed a double negative in the step description
See merge request !3199
Diffstat (limited to 'features')
-rw-r--r-- | features/project/network_graph.feature | 3 | ||||
-rw-r--r-- | features/steps/project/network_graph.rb | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/features/project/network_graph.feature b/features/project/network_graph.feature index 6cc89a15a78..89a02706bd2 100644 --- a/features/project/network_graph.feature +++ b/features/project/network_graph.feature @@ -34,9 +34,10 @@ Feature: Project Network Graph @javascript Scenario: I should filter selected tag When I switch ref to "v1.0.0" + Then page should have "v1.0.0" in title 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 "v1.0.0" + Then page should only have content from "v1.0.0" When click "Show only selected branch" checkbox Then page should have content not containing "v1.0.0" diff --git a/features/steps/project/network_graph.rb b/features/steps/project/network_graph.rb index 7a83d32a240..9b59b682676 100644 --- a/features/steps/project/network_graph.rb +++ b/features/steps/project/network_graph.rb @@ -41,17 +41,14 @@ class Spinach::Features::ProjectNetworkGraph < Spinach::FeatureSteps When 'I switch ref to "feature"' do select 'feature', from: 'ref' - sleep 2 end When 'I switch ref to "v1.0.0"' do select 'v1.0.0', from: 'ref' - sleep 2 end When 'click "Show only selected branch" checkbox' do find('#filter_ref').click - sleep 2 end step 'page should have content not containing "v1.0.0"' do @@ -60,7 +57,11 @@ class Spinach::Features::ProjectNetworkGraph < Spinach::FeatureSteps end end - step 'page should not have content not containing "v1.0.0"' do + step 'page should have "v1.0.0" in title' do + expect(page).to have_css 'title', text: 'Network ยท v1.0.0', visible: false + end + + step 'page should only have content from "v1.0.0"' do page.within '.network-graph' do expect(page).not_to have_content 'Change some files' end |