Merge branch 'sh-fix-failing-security-specs' into 'master'

Fix failing EE specs in security release

See merge request gitlab/gitlab-ee!753

ee/spec/controllers/groups/settings/ci_cd_controller_spec.rb

@@ -7,7 +7,7 @@ describe Groups::Settings::CiCdController do
   let(:user) { create(:user) }
 
   before do
-    group.add_maintainer(user)
+    group.add_owner(user)
     sign_in(user)
   end
 

ee/spec/models/burndown_spec.rb

@@ -128,6 +128,7 @@ describe Burndown do
     context 'when nested group milestone', :nested_groups do
       it_behaves_like 'burndown for milestone' do
         let(:milestone) { nested_group_milestone }
+        let(:project) { nested_group_project }
         let(:issue_params) do
           {
             milestone: milestone,
@@ -144,6 +145,7 @@ describe Burndown do
     context 'when non-nested group milestone' do
       it_behaves_like 'burndown for milestone' do
         let(:milestone) { group_milestone }
+        let(:project) { group_project }
         let(:issue_params) do
           {
             milestone: milestone,
@@ -160,6 +162,8 @@ describe Burndown do
 
   # Creates, closes and reopens issues only for odd days numbers
   def build_sample(milestone, issue_params)
+    project.add_master(user)
+
     milestone.start_date.upto(milestone.due_date) do |date|
       day = date.day
       next if day.even?

ee/spec/services/merge_requests/build_service_spec.rb

@@ -5,7 +5,7 @@ describe MergeRequests::BuildService do
   let(:target_project) { project }
   let(:user) { create(:user) }
   let(:description) { nil }
-  let(:source_branch) { 'feature-branch' }
+  let(:source_branch) { 'feature' }
   let(:target_branch) { 'master' }
   let(:merge_request) { service.execute }
   let(:compare) { double(:compare, commits: commits) }