diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-07-15 14:19:36 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-07-15 14:19:36 -0500 |
commit | 263f005e905088dc7b84276f0a14be567fd158b0 (patch) | |
tree | 9eaac23a687525b9c5d6ab8f5b5db7df339d9930 | |
parent | 4859770e2644be547943a7b4184292d099109ae3 (diff) | |
parent | e367bbff164cef36fcb4d5f819714347ed9a2ebd (diff) | |
download | gitlab-ce-263f005e905088dc7b84276f0a14be567fd158b0.tar.gz |
Merge branch 'fix-creating-group-with-space-in-group-path'
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/views/layouts/_search.html.haml | 2 | ||||
-rw-r--r-- | spec/features/groups_spec.rb | 20 |
3 files changed, 18 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index ef4a7aac206..457943c6b4b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -97,6 +97,7 @@ v 8.10.0 (unreleased) - Fix markdown rendering for: consecutive labels references, label references that begin with a digit or contains `.` - Fix last update timestamp on issues not preserved on gitlab.com and project imports - Fix issues importing projects from EE to CE + - Fix creating group with space in group path v 8.9.6 - Fix importing of events under notes for GitLab projects. !5154 diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index 245b9c3b4d4..f7580f00159 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -44,7 +44,7 @@ name: "#{j(@project.name)}" }; - - if @group and @group.path + - if @group && @group.persisted? && @group.path :javascript gl.groupOptions = gl.groupOptions || {}; gl.groupOptions["#{j(@group.path)}"] = { diff --git a/spec/features/groups_spec.rb b/spec/features/groups_spec.rb index 891df65216d..2d8b59472e8 100644 --- a/spec/features/groups_spec.rb +++ b/spec/features/groups_spec.rb @@ -1,14 +1,26 @@ require 'spec_helper' feature 'Group', feature: true do + before do + login_as(:admin) + end + + describe 'creating a group with space in group path' do + it 'renders new group form with validation errors' do + visit new_group_path + fill_in 'Group path', with: 'space group' + + click_button 'Create group' + + expect(current_path).to eq(groups_path) + expect(page).to have_content("Path can contain only letters, digits, '_', '-' and '.'. Cannot start with '-' or end in '.'.") + end + end + describe 'description' do let(:group) { create(:group) } let(:path) { group_path(group) } - before do - login_as(:admin) - end - it 'parses Markdown' do group.update_attribute(:description, 'This is **my** group') visit path |