Fixed repository_controller_spec

also added an #open_branches private method

2 files changed, 8 insertions, 5 deletions

diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb
index 7a1edee0822..a9d10dcddef 100644
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@@ -5,7 +5,7 @@ module Projects
 
       def show
         @deploy_keys = DeployKeysPresenter
-          .new(@project, current_user: @current_user)
+          .new(@project, current_user: current_user)
 
         define_protected_branches
       end
@@ -37,10 +37,13 @@ module Projects
         }
       end
 
+      def open_branches
+        branches = @project.open_branches.map { |br| { text: br.name, id: br.name, title: br.name } }
+        { open_branches: branches }
+      end
+
       def load_gon_index
-        open_branches = @project.open_branches.map { |br| { text: br.name, id: br.name, title: br.name } }
-        params = { open_branches: open_branches }
-        gon.push(params.merge(access_levels_options))
+        gon.push(open_branches.merge(access_levels_options))
       end
     end
   end
diff --git a/spec/controllers/projects/settings/repository_controller_spec.rb b/spec/controllers/projects/settings/repository_controller_spec.rb
index 77faf96033d..f73471f8ca8 100644
--- a/spec/controllers/projects/settings/repository_controller_spec.rb
+++ b/spec/controllers/projects/settings/repository_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Projects::Settings::RepositoryController do
-  let(:project) { create(:empty_project, :public) }
+  let(:project) { create(:project_empty_repo, :public) }
   let(:user) { create(:user) }
 
   before do