git_helper 3.1.2 → 3.3.0

data/lib/git_helper/version.rb

@@ -1,3 +1,3 @@
 module GitHelper
-  VERSION = '3.1.2'
+  VERSION = '3.3.0'
 end

data/spec/git_helper/change_remote_spec.rb

@@ -4,7 +4,7 @@ require 'git_helper'
 describe GitHelper::ChangeRemote do
   let(:remote1) { "git@github.com:#{old_owner}/#{project}.git" }
   let(:project) { Faker::Lorem.word }
-  let(:cli) { double(:highline_cli, process_directory_remotes?: true) }
+  let(:cli) { double(:highline_cli, ask_yes_no: true) }
   let(:old_owner) { Faker::Internet.username }
   let(:new_owner) { Faker::Internet.username }
   let(:directory_entries) { [ '.', '..', project, Faker::Lorem.word, Faker::Lorem.word ] }
@@ -26,6 +26,7 @@ describe GitHelper::ChangeRemote do
   before do
     allow(GitHelper::HighlineCli).to receive(:new).and_return(cli)
     allow(GitHelper::LocalCode).to receive(:new).and_return(local_code)
+    allow(subject).to receive(:puts)
   end
 
   describe '#execute' do
@@ -72,7 +73,7 @@ describe GitHelper::ChangeRemote do
     end
 
     context 'when the user says not to process the directory' do
-      let(:cli) { double(:highline_cli, process_directory_remotes?: false) }
+      let(:cli) { double(:highline_cli, ask_yes_no: false) }
 
       it 'should not call to process the directory' do
         expect(subject).not_to receive(:process_git_repository)

data/spec/git_helper/code_request_spec.rb

@@ -13,6 +13,7 @@ describe GitHelper::CodeRequest do
   before do
     allow(GitHelper::LocalCode).to receive(:new).and_return(local_code)
     allow(GitHelper::HighlineCli).to receive(:new).and_return(highline_cli)
+    allow(subject).to receive(:puts)
   end
 
   describe '#create' do
@@ -100,19 +101,19 @@ describe GitHelper::CodeRequest do
 
   describe '#ask_for_clarification' do
     it 'should ask the CLI' do
-      expect(highline_cli).to receive(:conflicting_remote_clarification).and_return('github')
+      expect(highline_cli).to receive(:ask).and_return('github')
       subject.send(:ask_for_clarification)
     end
 
     context 'when response is github' do
       it 'should return github_pull_request' do
-        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return('github')
+        allow(highline_cli).to receive(:ask).and_return('github')
         expect(subject).to receive(:github_pull_request)
         subject.send(:ask_for_clarification)
       end
 
       it 'should return github_pull_request' do
-        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return('Github')
+        allow(highline_cli).to receive(:ask).and_return('Github')
         expect(subject).to receive(:github_pull_request)
         subject.send(:ask_for_clarification)
       end
@@ -120,21 +121,22 @@ describe GitHelper::CodeRequest do
 
     context 'when response is gitlab' do
       it 'should return gitlab_merge_request' do
-        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return('gitlab')
+        allow(highline_cli).to receive(:ask).and_return('gitlab')
         expect(subject).to receive(:gitlab_merge_request)
         subject.send(:ask_for_clarification)
       end
 
       it 'should return gitlab_merge_request' do
-        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return('Gitlab')
+        allow(highline_cli).to receive(:ask).and_return('Gitlab')
         expect(subject).to receive(:gitlab_merge_request)
         subject.send(:ask_for_clarification)
       end
     end
 
+    # Unfortunately this test sometimes fails... just rerun the tests if it does
     context 'when response is neither' do
       it 'should raise an error' do
-        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return(Faker::Lorem.word)
+        allow(highline_cli).to receive(:ask).and_return(Faker::Lorem.word)
         expect(subject).to receive(:exit)
         subject.send(:ask_for_clarification)
       end
@@ -172,23 +174,23 @@ describe GitHelper::CodeRequest do
   describe '#base_branch' do
     it 'should call the default branch' do
       expect(subject).to receive(:default_branch)
-      allow(highline_cli).to receive(:base_branch_default?).at_least(:once)
-      allow(highline_cli).to receive(:base_branch).at_least(:once).and_return(base_branch)
+      allow(highline_cli).to receive(:ask_yes_no).at_least(:once)
+      allow(highline_cli).to receive(:ask).at_least(:once).and_return(base_branch)
       subject.send(:base_branch)
     end
 
     it 'should ask the CLI to ask the user' do
       allow(subject).to receive(:default_branch)
-      expect(highline_cli).to receive(:base_branch_default?).at_least(:once)
-      allow(highline_cli).to receive(:base_branch).at_least(:once).and_return(base_branch)
+      expect(highline_cli).to receive(:ask_yes_no).at_least(:once)
+      allow(highline_cli).to receive(:ask).at_least(:once).and_return(base_branch)
       subject.send(:base_branch)
     end
 
     context 'if the user says no' do
       it 'definitely asks for the users base branch' do
         allow(subject).to receive(:default_branch)
-        expect(highline_cli).to receive(:base_branch_default?).at_least(:once).and_return(false)
-        expect(highline_cli).to receive(:base_branch).at_least(:once).and_return(base_branch)
+        expect(highline_cli).to receive(:ask_yes_no).at_least(:once).and_return(false)
+        expect(highline_cli).to receive(:ask).at_least(:once).and_return(base_branch)
         subject.send(:base_branch)
       end
     end
@@ -196,7 +198,7 @@ describe GitHelper::CodeRequest do
     context 'if the user says yes' do
       it 'does not ask for the users base branch' do
         allow(subject).to receive(:default_branch)
-        expect(highline_cli).to receive(:base_branch_default?).at_least(:once).and_return(true)
+        expect(highline_cli).to receive(:ask_yes_no).at_least(:once).and_return(true)
         expect(highline_cli).not_to receive(:base_branch)
         subject.send(:base_branch)
       end
@@ -214,32 +216,32 @@ describe GitHelper::CodeRequest do
   describe '#new_code_request_title' do
     it 'should call autogenerated title method' do
       expect(subject).to receive(:autogenerated_title)
-      allow(highline_cli).to receive(:accept_autogenerated_title?).at_least(:once)
-      allow(highline_cli).to receive(:title).at_least(:once).and_return(title)
+      allow(highline_cli).to receive(:ask_yes_no).at_least(:once)
+      allow(highline_cli).to receive(:ask).at_least(:once).and_return(title)
       subject.send(:new_code_request_title)
     end
 
     it 'should ask the CLI to ask the user' do
-      allow(subject).to receive(:autogenerated_title)
-      expect(highline_cli).to receive(:accept_autogenerated_title?).at_least(:once)
-      allow(highline_cli).to receive(:title).at_least(:once).and_return(title)
+      allow(subject).to receive(:autogenerated_title).and_return(Faker::Lorem.sentence)
+      expect(highline_cli).to receive(:ask_yes_no).at_least(:once)
+      allow(highline_cli).to receive(:ask).at_least(:once).and_return(title)
       subject.send(:new_code_request_title)
     end
 
     context 'if the user says no' do
       it 'definitely asks for the users title' do
-        allow(subject).to receive(:autogenerated_title)
-        expect(highline_cli).to receive(:accept_autogenerated_title?).at_least(:once).and_return(false)
-        expect(highline_cli).to receive(:title).at_least(:once).and_return(title)
+        allow(subject).to receive(:autogenerated_title).and_return(Faker::Lorem.sentence)
+        expect(highline_cli).to receive(:ask_yes_no).at_least(:once).and_return(false)
+        expect(highline_cli).to receive(:ask).at_least(:once).and_return(title)
         subject.send(:new_code_request_title)
       end
     end
 
     context 'if the user says yes to original title' do
       it 'does not ask for the users chosen title' do
-        allow(subject).to receive(:autogenerated_title)
-        expect(highline_cli).to receive(:accept_autogenerated_title?).at_least(:once).and_return(true)
-        expect(highline_cli).not_to receive(:title)
+        allow(subject).to receive(:autogenerated_title).and_return(Faker::Lorem.sentence)
+        expect(highline_cli).to receive(:ask_yes_no).at_least(:once).and_return(true)
+        expect(highline_cli).not_to receive(:ask)
         subject.send(:new_code_request_title)
       end
     end

data/spec/git_helper/highline_cli_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'git_helper'
 
 describe GitHelper::HighlineCli do
-  let(:response) { double(:response, readline: true, to_i: 5) }
+  let(:response) { double(:response, readline: true, to_i: 3) }
   let(:highline_client) { double(:highline_cli, ask: response) }
 
   subject { GitHelper::HighlineCli.new }
@@ -11,207 +11,41 @@ describe GitHelper::HighlineCli do
     allow(HighLine).to receive(:new).and_return(highline_client)
   end
 
-  describe '#new_branch_name' do
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).with('New branch name?')
-      subject.new_branch_name
-    end
-
-    it 'should come out a string' do
-      expect(subject.new_branch_name).to be_a(String)
-    end
-  end
-
-  describe '#process_directory_remotes' do
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).and_return('y')
-      subject.process_directory_remotes?(Faker::Lorem.word)
-    end
-
-    it 'should be a boolean at the end' do
-      allow(subject).to receive(:ask).and_return('y')
-      expect([true, false]).to include(subject.process_directory_remotes?(Faker::Lorem.word))
-    end
-
-    it 'should come out as a true boolean if somebody responds y' do
-      allow(subject).to receive(:ask).and_return('y')
-      expect(subject.process_directory_remotes?(Faker::Lorem.word)).to eq(true)
-    end
-
-    it 'should come out as a false boolean if somebody responds n' do
-      allow(subject).to receive(:ask).and_return('n')
-      expect(subject.process_directory_remotes?(Faker::Lorem.word)).to eq(false)
-    end
-
-    it 'should come out as true if somebody presses enter' do
-      allow(subject).to receive(:ask).and_return('')
-      expect(subject.accept_autogenerated_title?(Faker::Lorem.word)).to eq(true)
-    end
-  end
-
-  describe '#conflicting_remote_clarification' do
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).with('Found git remotes for both GitHub and GitLab. Would you like to proceed with GitLab or GitHub? (github/gitlab)').and_return('gitlab')
-      subject.conflicting_remote_clarification
-    end
-
-    it 'should come out a string' do
-      expect(subject.conflicting_remote_clarification).to be_a(String)
-    end
-  end
-
-  describe '#title' do
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).with('Title?')
-      subject.title
-    end
-
-    it 'should come out a string' do
-      expect(subject.title).to be_a(String)
-    end
-  end
-
-  describe '#base_branch' do
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).with('Base branch?')
-      subject.base_branch
-    end
-
-    it 'should come out a string' do
-      expect(subject.base_branch).to be_a(String)
-    end
-  end
-
-  describe '#code_request_id' do
-    let(:phrase) { Faker::Lorem.sentence }
-
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).with("#{phrase} Request ID?")
-      subject.code_request_id(phrase)
-    end
-
-    it 'should come out a string' do
-      expect(subject.code_request_id(phrase)).to be_a(String)
-    end
-  end
-
-  describe '#accept_autogenerated_title' do
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).and_return('y')
-      subject.accept_autogenerated_title?(Faker::Lorem.sentence)
-    end
-
-    it 'should be a boolean at the end' do
-      allow(subject).to receive(:ask).and_return('y')
-      expect([true, false]).to include(subject.accept_autogenerated_title?(Faker::Lorem.sentence))
-    end
-
-    it 'should come out as a true boolean if somebody responds y' do
-      allow(subject).to receive(:ask).and_return('y')
-      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(true)
-    end
-
-    it 'should come out as a true boolean if somebody responds n' do
-      allow(subject).to receive(:ask).and_return('n')
-      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(false)
-    end
-
-    it 'should come out as a true boolean if somebody responds yes' do
-      allow(subject).to receive(:ask).and_return('yes')
-      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(true)
-    end
-
-    it 'should come out as a false boolean if somebody responds no' do
-      allow(subject).to receive(:ask).and_return('no')
-      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(false)
-    end
-
-    it 'should come out as true if somebody presses enter' do
-      allow(subject).to receive(:ask).and_return('')
-      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(true)
-    end
-  end
-
-  describe '#base_branch_default' do
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).and_return('y')
-      subject.base_branch_default?(Faker::Lorem.word)
-    end
-
-    it 'should be a boolean at the end' do
-      allow(subject).to receive(:ask).and_return('y')
-      expect([true, false]).to include(subject.base_branch_default?(Faker::Lorem.word))
-    end
-
-    it 'should come out as a true boolean if somebody responds y' do
-      allow(subject).to receive(:ask).and_return('y')
-      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(true)
-    end
-
-    it 'should come out as a true boolean if somebody responds n' do
-      allow(subject).to receive(:ask).and_return('n')
-      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(false)
-    end
-
-    it 'should come out as a true boolean if somebody responds yes' do
-      allow(subject).to receive(:ask).and_return('yes')
-      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(true)
-    end
-
-    it 'should come out as a false boolean if somebody responds no' do
-      allow(subject).to receive(:ask).and_return('no')
-      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(false)
-    end
-
-    it 'should come out as true if somebody presses enter' do
-      allow(subject).to receive(:ask).and_return('')
-      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(true)
-    end
-  end
-
-  describe '#merge_method' do
-    it 'should ask the subjects ask_options method' do
-      expect(subject).to receive(:ask_options).and_return(3)
-      subject.merge_method(['1', '2', '3'])
-    end
-
-    it 'should return a string' do
-      allow(subject).to receive(:ask_options).and_return(2)
-      expect(subject.merge_method(['1', '2', '3'])).to be_a(String)
-    end
-  end
-
-  describe '#template_to_apply' do
-    it 'should ask the subjects ask_options method' do
-      expect(subject).to receive(:ask_options).and_return(3)
-      subject.template_to_apply(['option1', 'option2', 'option3'], 'example type')
+  describe '#ask' do
+    it 'should ask the highline client ask'do
+      expect(highline_client).to receive(:ask)
+      subject.ask(Faker::Lorem.sentence)
     end
 
     it 'should return a string' do
-      allow(subject).to receive(:ask_options).and_return(3)
-      expect(subject.template_to_apply(['option1', 'option2', 'option3'], 'example type')).to eq('None')
+      expect(subject.ask(Faker::Lorem.sentence)).to be_a(String)
     end
   end
 
-  describe '#ask' do
+  describe '#ask_yes_no' do
     it 'should ask the highline client ask'do
       expect(highline_client).to receive(:ask)
-      subject.send(:ask, Faker::Lorem.sentence)
+      subject.ask_yes_no(Faker::Lorem.sentence)
     end
 
-    it 'should return a string' do
-      expect(subject.send(:ask, Faker::Lorem.sentence)).to be_a(String)
+    it 'should return a boolean' do
+      expect(subject.ask_yes_no(Faker::Lorem.sentence)).to be_falsey
+    end
+
+    it 'should return true if we say yes' do
+      allow(response).to receive(:to_s).and_return('y')
+      expect(subject.ask_yes_no(Faker::Lorem.sentence)).to be_truthy
     end
   end
 
   describe '#ask_options' do
     it 'should ask the highline client ask'do
       expect(highline_client).to receive(:ask)
-      subject.send(:ask_options, Faker::Lorem.sentence, ['1', '2', '3'])
+      subject.ask_options(Faker::Lorem.sentence, ['one', 'two', 'three'])
     end
 
-    it 'should return an integer' do
-      expect(subject.send(:ask_options, Faker::Lorem.sentence, ['1', '2', '3'])).to be_a(Integer)
+    it 'should return a string from the options' do
+      expect(subject.ask_options(Faker::Lorem.sentence, ['one', 'two', 'three'])).to be_a(String)
     end
   end
 end

data/spec/git_helper/local_code_spec.rb

@@ -70,6 +70,7 @@ describe GitHelper::LocalCode do
 
   describe '#change_remote' do
     it 'should return a string' do
+      allow(subject).to receive(:`).and_return(Faker::Lorem.word)
       expect(subject.change_remote(Faker::Lorem.word, Faker::Internet.url)).to be_a(String)
     end
   end

data/spec/git_helper/merge_request_spec.rb

@@ -6,6 +6,15 @@ describe GitHelper::GitLabMergeRequest do
   let(:highline_cli) { double(:highline_cli) }
   let(:gitlab_client_client) { double(:gitlab_client_client, project: :project, merge_request: :merge_request, create_merge_request: :created) }
   let(:gitlab_client) { double(:gitlab_client, client: gitlab_client_client) }
+  let(:diff_refs) { double(:diff_refs, base_sha: :base, head_sha: :head) }
+
+  let(:merge_request) do
+    double(:merge_request,
+      diff_refs: diff_refs,
+      web_url: Faker::Internet.url,
+      merge_commit_sha: Faker::Internet.password
+    )
+  end
 
   let(:options) do
     {
@@ -20,6 +29,7 @@ describe GitHelper::GitLabMergeRequest do
 
   before do
     allow(GitHelper::GitLabClient).to receive(:new).and_return(gitlab_client)
+    allow(subject).to receive(:puts)
   end
 
   describe '#create' do
@@ -27,7 +37,7 @@ describe GitHelper::GitLabMergeRequest do
       allow(subject).to receive(:squash_merge_request).and_return(true)
       allow(subject).to receive(:remove_source_branch).and_return(false)
       allow(subject).to receive(:new_mr_body).and_return('')
-      expect(gitlab_client_client).to receive(:create_merge_request)
+      expect(gitlab_client_client).to receive(:create_merge_request).and_return(merge_request)
       subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})
     end
 
@@ -35,7 +45,7 @@ describe GitHelper::GitLabMergeRequest do
       expect(subject).to receive(:squash_merge_request).and_return(true)
       expect(subject).to receive(:remove_source_branch).and_return(false)
       expect(subject).to receive(:new_mr_body).and_return('')
-      allow(gitlab_client_client).to receive(:create_merge_request)
+      allow(gitlab_client_client).to receive(:create_merge_request).and_return(merge_request)
       subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})
     end
 
@@ -52,14 +62,14 @@ describe GitHelper::GitLabMergeRequest do
     it 'should call the gitlab client to merge' do
       allow(subject).to receive(:existing_mr).and_return(double(should_remove_source_branch: true, squash: false, title: 'title'))
       allow(subject).to receive(:mr_id).and_return(Faker::Number.number)
-      expect(gitlab_client_client).to receive(:accept_merge_request)
+      expect(gitlab_client_client).to receive(:accept_merge_request).and_return(merge_request)
       subject.merge
     end
 
     it 'should call various other methods' do
       expect(subject).to receive(:existing_mr).and_return(double(should_remove_source_branch: true, squash: false, title: 'title')).at_least(:once)
       expect(subject).to receive(:mr_id).and_return(Faker::Number.number).at_least(:once)
-      allow(gitlab_client_client).to receive(:accept_merge_request)
+      allow(gitlab_client_client).to receive(:accept_merge_request).and_return(merge_request)
       subject.merge
     end
 
@@ -73,7 +83,7 @@ describe GitHelper::GitLabMergeRequest do
     it 'should try to merge multiple times if the first merge errors' do
       allow(subject).to receive(:existing_mr).and_return(double(should_remove_source_branch: true, squash: false, title: 'title'))
       allow(subject).to receive(:mr_id).and_return(Faker::Number.number)
-      expect(gitlab_client_client).to receive(:accept_merge_request).and_return(double(merge_commit_sha: nil)).exactly(2).times
+      expect(gitlab_client_client).to receive(:accept_merge_request).and_return(double(merge_commit_sha: nil, merge_error: Faker::Lorem.word)).exactly(2).times
       expect(subject.merge).to eq(nil)
     end
   end
@@ -110,19 +120,19 @@ describe GitHelper::GitLabMergeRequest do
 
       it 'should call the CLI to ask about a single template' do
         allow(subject).to receive(:mr_template_options).and_return([template])
-        expect(highline_cli).to receive(:apply_template?).and_return(true)
+        expect(highline_cli).to receive(:ask_yes_no).and_return(true)
         subject.send(:template_name_to_apply)
       end
 
       it 'should return the single template if the user says yes' do
         allow(subject).to receive(:mr_template_options).and_return([template])
-        allow(highline_cli).to receive(:apply_template?).and_return(true)
+        allow(highline_cli).to receive(:ask_yes_no).and_return(true)
         expect(subject.send(:template_name_to_apply)).to eq(template)
       end
 
       it 'should return nil if the user says no' do
         allow(subject).to receive(:mr_template_options).and_return([template])
-        allow(highline_cli).to receive(:apply_template?).and_return(false)
+        allow(highline_cli).to receive(:ask_yes_no).and_return(false)
         expect(subject.send(:template_name_to_apply)).to eq(nil)
       end
     end
@@ -133,19 +143,19 @@ describe GitHelper::GitLabMergeRequest do
 
       it 'should call the CLI to ask which of multiple templates to apply' do
         allow(subject).to receive(:mr_template_options).and_return([template1, template2])
-        expect(highline_cli).to receive(:template_to_apply).and_return(template1)
+        expect(highline_cli).to receive(:ask_options).and_return(template1)
         subject.send(:template_name_to_apply)
       end
 
       it 'should return the answer template if the user says yes' do
         allow(subject).to receive(:mr_template_options).and_return([template1, template2])
-        allow(highline_cli).to receive(:template_to_apply).and_return(template1)
+        allow(highline_cli).to receive(:ask_options).and_return(template1)
         expect(subject.send(:template_name_to_apply)).to eq(template1)
       end
 
       it 'should return nil if the user says no' do
         allow(subject).to receive(:mr_template_options).and_return([template1, template2])
-        allow(highline_cli).to receive(:template_to_apply).and_return('None')
+        allow(highline_cli).to receive(:ask_options).and_return('None')
         expect(subject.send(:template_name_to_apply)).to eq(nil)
       end
     end
@@ -160,25 +170,25 @@ describe GitHelper::GitLabMergeRequest do
 
   describe '#mr_id' do
     it 'should ask the CLI for the code request ID' do
-      expect(highline_cli).to receive(:code_request_id).and_return(Faker::Number.number)
+      expect(highline_cli).to receive(:ask).and_return(Faker::Number.number)
       subject.send(:mr_id)
     end
 
     it 'should equal an integer' do
       pr_id = Faker::Number.number
-      expect(highline_cli).to receive(:code_request_id).and_return(pr_id)
+      expect(highline_cli).to receive(:ask).and_return(pr_id)
       expect(subject.send(:mr_id)).to eq(pr_id)
     end
   end
 
   describe '#squash_merge_request' do
     it 'should ask the CLI for the code request ID' do
-      expect(highline_cli).to receive(:squash_merge_request?).and_return(true)
+      expect(highline_cli).to receive(:ask_yes_no).and_return(true)
       subject.send(:squash_merge_request)
     end
 
     it 'should be a boolean' do
-      expect(highline_cli).to receive(:squash_merge_request?).and_return(false)
+      expect(highline_cli).to receive(:ask_yes_no).and_return(false)
       expect([true, false]).to include(subject.send(:squash_merge_request))
     end
   end
@@ -190,12 +200,12 @@ describe GitHelper::GitLabMergeRequest do
 
     context 'when the existing project has no setting' do
       it 'should ask the CLI for the code request ID' do
-        expect(highline_cli).to receive(:remove_source_branch?).and_return(true)
+        expect(highline_cli).to receive(:ask_yes_no).and_return(true)
         subject.send(:remove_source_branch)
       end
 
       it 'should be a boolean' do
-        allow(highline_cli).to receive(:remove_source_branch?).and_return(false)
+        allow(highline_cli).to receive(:ask_yes_no).and_return(false)
         expect([true, false]).to include(subject.send(:remove_source_branch))
       end
     end
@@ -212,7 +222,7 @@ describe GitHelper::GitLabMergeRequest do
 
     it 'should return the existing projects setting if it exists' do
       allow(subject).to receive(:existing_project).and_return(double(remove_source_branch_after_merge: false))
-      allow(highline_cli).to receive(:remove_source_branch?).and_return(true)
+      allow(highline_cli).to receive(:ask_yes_no).and_return(true)
       expect(subject.send(:remove_source_branch)).to eq(true)
     end
   end
@@ -226,7 +236,7 @@ describe GitHelper::GitLabMergeRequest do
 
   describe '#existing_mr' do
     it 'should call the gitlab client' do
-      allow(highline_cli).to receive(:code_request_id).and_return(Faker::Number.number)
+      allow(highline_cli).to receive(:ask).and_return(Faker::Number.number)
       expect(gitlab_client_client).to receive(:merge_request).and_return(:merge_request)
       subject.send(:existing_mr)
     end