GitHub importer use default project visibility for non-private projects

lib/gitlab/github_import/project_creator.rb

@@ -17,7 +17,7 @@ module Gitlab
           path: repo.name,
           description: repo.description,
           namespace_id: namespace.id,
-          visibility_level: repo.private ? Gitlab::VisibilityLevel::PRIVATE : Gitlab::VisibilityLevel::PUBLIC,
+          visibility_level: repo.private ? Gitlab::VisibilityLevel::PRIVATE : ApplicationSetting.current.default_project_visibility,
           import_type: "github",
           import_source: repo.full_name,
           import_url: repo.clone_url.sub("https://", "https://#{@session_data[:github_access_token]}@"),

spec/lib/gitlab/github_import/project_creator_spec.rb

@@ -2,33 +2,59 @@ require 'spec_helper'
 
 describe Gitlab::GithubImport::ProjectCreator, lib: true do
   let(:user) { create(:user) }
+  let(:namespace) { create(:group, owner: user) }
+
   let(:repo) do
     OpenStruct.new(
       login: 'vim',
       name: 'vim',
-      private: true,
       full_name: 'asd/vim',
-      clone_url: "https://gitlab.com/asd/vim.git",
+      clone_url: 'https://gitlab.com/asd/vim.git'
-      owner: OpenStruct.new(login: "john")
     )
   end
-  let(:namespace) { create(:group, owner: user) }
+
-  let(:token) { "asdffg" }
+  subject(:service) { described_class.new(repo, namespace, user, github_access_token: 'asdffg') }
-  let(:access_params) { { github_access_token: token } }
 
   before do
     namespace.add_owner(user)
+    allow_any_instance_of(Project).to receive(:add_import_job)
   end
 
-  it 'creates project' do
+  describe '#execute' do
-    allow_any_instance_of(Project).to receive(:add_import_job)
+    it 'creates a project' do
+      expect { service.execute }.to change(Project, :count).by(1)
+    end
 
-    project_creator = Gitlab::GithubImport::ProjectCreator.new(repo, namespace, user, access_params)
+    it 'handle GitHub credentials' do
-    project = project_creator.execute
+      project = service.execute
 
-    expect(project.import_url).to eq("https://asdffg@gitlab.com/asd/vim.git")
+      expect(project.import_url).to eq('https://asdffg@gitlab.com/asd/vim.git')
-    expect(project.safe_import_url).to eq("https://*****@gitlab.com/asd/vim.git")
+      expect(project.safe_import_url).to eq('https://*****@gitlab.com/asd/vim.git')
-    expect(project.import_data.credentials).to eq(user: "asdffg", password: nil)
+      expect(project.import_data.credentials).to eq(user: 'asdffg', password: nil)
-    expect(project.visibility_level).to eq(Gitlab::VisibilityLevel::PRIVATE)
+    end
+
+    context 'when Github project is private' do
+      it 'sets project visibility to private' do
+        repo.private = true
+
+        project = service.execute
+
+        expect(project.visibility_level).to eq(Gitlab::VisibilityLevel::PRIVATE)
+      end
+    end
+
+    context 'when Github project is public' do
+      before do
+        allow_any_instance_of(ApplicationSetting).to receive(:default_project_visibility).and_return(Gitlab::VisibilityLevel::INTERNAL)
+      end
+
+      it 'sets project visibility to the default project visibility' do
+        repo.private = false
+
+        project = service.execute
+
+        expect(project.visibility_level).to eq(Gitlab::VisibilityLevel::INTERNAL)
+      end
+    end
   end
 end