summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2016-11-03 11:47:15 -0200
committerFelipe Artur <felipefac@gmail.com>2016-11-10 14:41:03 -0200
commitd1f0b2f4339a7a46679ceb361982448229013c13 (patch)
tree2ffc7d46fce0e70e3fc50098ff32f43de5fd2154
parente4c05de75ccec1b0d64a7a994f05d54bffc903e5 (diff)
downloadgitlab-ce-issue_20245.tar.gz
Fix project Visibility level selector not using default valuesissue_20245
-rw-r--r--app/views/projects/new.html.haml3
-rw-r--r--changelogs/unreleased/issue_20245.yml4
-rw-r--r--spec/features/projects/new_project_spec.rb19
3 files changed, 25 insertions, 1 deletions
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 932603f03b0..0788924d44a 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