summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-11-08 09:31:43 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-11-08 09:31:43 +0000
commit55e0065b49d63f53c40876196d8f110e4eb3ea32 (patch)
tree60da0989e7b06d49f5510b63ba9e6ce9b16ac501 /features
parenta6b4975724c50bc09206c0201f159c65e610859e (diff)
parent5569573a24efca76abede20370988a81d623e6a5 (diff)
downloadgitlab-ce-55e0065b49d63f53c40876196d8f110e4eb3ea32.tar.gz
Merge branch 'fix-404-on-network-when-entering-a-nonexistent-git-revision' into 'master'
Network page appear with an error message when entering nonexistent git revision Closes #2362 See merge request !7172
Diffstat (limited to 'features')
-rw-r--r--features/project/network_graph.feature2
-rw-r--r--features/steps/project/network_graph.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/features/project/network_graph.feature b/features/project/network_graph.feature
index 89a02706bd2..93c884e23c5 100644
--- a/features/project/network_graph.feature
+++ b/features/project/network_graph.feature
@@ -43,4 +43,4 @@ Feature: Project Network Graph
Scenario: I should fail to look for a commit
When I look for a commit by ";"
- Then page status code should be 404
+ Then I should see non-existent git revision error message
diff --git a/features/steps/project/network_graph.rb b/features/steps/project/network_graph.rb
index 019b3124a86..ff9251615c9 100644
--- a/features/steps/project/network_graph.rb
+++ b/features/steps/project/network_graph.rb
@@ -109,4 +109,8 @@ class Spinach::Features::ProjectNetworkGraph < Spinach::FeatureSteps
find('button').click
end
end
+
+ step 'I should see non-existent git revision error message' do
+ expect(page).to have_selector '.flash-alert', text: "Git revision ';' does not exist."
+ end
end