diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-11-14 10:05:30 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-15 18:37:33 +0100 |
| commit | 548bbf83992b9eca568819ab2bda4bc3000d0138 (patch) | |
| tree | da71b12df347d34c3646f5ffc821795669dd51ab | |
| parent | bf149a156cc9c5a5fddd2767f7d96d6823bb852a (diff) | |
| download | gitlab-ce-548bbf83992b9eca568819ab2bda4bc3000d0138.tar.gz | |
Merge branch 'issue_20245' into 'master'
Fix project Visibility level selector not using default values
closes #20245
See merge request !7264
| -rw-r--r-- | app/views/projects/new.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/issue_20245.yml | 4 | ||||
| -rw-r--r-- | spec/features/projects/new_project_spec.rb | 19 |
3 files changed, 25 insertions, 1 deletions
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 399ccf15b7f..9436c64ee28 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -90,7 +90,8 @@ = f.label :visibility_level, class: 'label-light' do Visibility Level = link_to "(?)", help_page_path("public_access/public_access") - = render('shared/visibility_radios', model_method: :visibility_level, form: f, selected_level: @project.visibility_level, form_model: @project) + = render 'shared/visibility_level', f: f, visibility_level: default_project_visibility, can_change_visibility_level: true, form_model: @project + = f.submit 'Create project', class: "btn btn-create project-submit", tabindex: 4 = link_to 'Cancel', dashboard_projects_path, class: 'btn btn-cancel' diff --git a/changelogs/unreleased/issue_20245.yml b/changelogs/unreleased/issue_20245.yml new file mode 100644 index 00000000000..e5d09d85683 --- /dev/null +++ b/changelogs/unreleased/issue_20245.yml @@ -0,0 +1,4 @@ +--- +title: Fix project Visibility Level selector not using default values +merge_request: +author: diff --git a/spec/features/projects/new_project_spec.rb b/spec/features/projects/new_project_spec.rb new file mode 100644 index 00000000000..abfc46601fb --- /dev/null +++ b/spec/features/projects/new_project_spec.rb @@ -0,0 +1,19 @@ +require "spec_helper" + +feature "New project", feature: true do + context "Visibility level selector" do + let(:user) { create(:admin) } + + before { login_as(user) } + + Gitlab::VisibilityLevel.options.each do |key, level| + it "sets selector to #{key}" do + stub_application_setting(default_project_visibility: level) + + visit new_project_path + + expect(find_field("project_visibility_level_#{level}")).to be_checked + end + end + end +end |