From d1f0b2f4339a7a46679ceb361982448229013c13 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Thu, 3 Nov 2016 11:47:15 -0200
Subject: Fix project Visibility level selector not using default values

---
 app/views/projects/new.html.haml           |  3 ++-
 changelogs/unreleased/issue_20245.yml      |  4 ++++
 spec/features/projects/new_project_spec.rb | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/issue_20245.yml
 create mode 100644 spec/features/projects/new_project_spec.rb

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
-- 
cgit v1.2.1