summaryrefslogtreecommitdiff
path: root/features/steps
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-15 10:36:24 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-15 10:36:24 +0000
commit524b3db30ca53449c13cb6bb9a518cfc2c0cacf7 (patch)
tree47b332794787eea77ce7f0a846f3c08468a03cff /features/steps
parent465a20888a0c226be5dbaf0f54da916127b0f220 (diff)
parentd02d02c672bcac0d2ef46204d132645bc69827a8 (diff)
downloadgitlab-ce-524b3db30ca53449c13cb6bb9a518cfc2c0cacf7.tar.gz
Merge branch 'fix-path-with-leading-dot-error' into 'master'
Fix error preventing displaying of commit data for a directory with a leading dot Directories with leading dots erroneously get rejected by the route controller if git ref regex is used in constraints. This prevents commit data from being loaded. The regex verification is now done in controller. Closes https://github.com/gitlabhq/gitlabhq/issues/8763 See merge request !1574
Diffstat (limited to 'features/steps')
-rw-r--r--features/steps/project/source/browse_files.rb13
1 files changed, 13 insertions, 0 deletions
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index cb100ca0f54..1b27500497a 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -286,6 +286,10 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
select "'test'", from: 'ref'
end
+ step "I switch ref to fix" do
+ select "fix", from: 'ref'
+ end
+
step "I see the ref 'test' has been selected" do
expect(page).to have_selector '.select2-chosen', text: "'test'"
end
@@ -294,11 +298,20 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
visit namespace_project_tree_path(@project.namespace, @project, "'test'")
end
+ step "I visit the fix tree" do
+ visit namespace_project_tree_path(@project.namespace, @project, "fix/.testdir")
+ end
+
step 'I see the commit data' do
expect(page).to have_css('.tree-commit-link', visible: true)
expect(page).not_to have_content('Loading commit data...')
end
+ step 'I see the commit data for a directory with a leading dot' do
+ expect(page).to have_css('.tree-commit-link', visible: true)
+ expect(page).not_to have_content('Loading commit data...')
+ end
+
private
def set_new_content