git_helper 3.0.0 → 3.2.0

data/spec/git_helper/git_config_reader_spec.rb

@@ -2,13 +2,14 @@ require 'spec_helper'
 require 'git_helper'
 
 describe GitHelper::GitConfigReader do
-  let(:github_token) { '1234ASDF1234ASDF' }
-  let(:gitlab_token) { 'ASDF123ASDF1234' }
+  let(:github_token) { Faker::Internet.password(max_length: 10) }
+  let(:gitlab_token) { Faker::Internet.password(max_length: 10) }
+
   let(:config_file) {
     {
-      github_user: 'github-user-name',
+      github_user: Faker::Internet.username,
       github_token: github_token,
-      gitlab_user: 'gitlab-user-name',
+      gitlab_user: Faker::Internet.username,
       gitlab_token: gitlab_token
     }
   }
@@ -48,13 +49,14 @@ describe GitHelper::GitConfigReader do
 
   describe '#git_config_file_path' do
     it 'should look in the current directory' do
-      expect(Dir).to receive(:pwd).and_return('/Users/firstnamelastname/path/to/git_helper')
+      expect(Dir).to receive(:pwd).and_return("/Users/#{Faker::Name.first_name}/#{Faker::Lorem.word}")
       subject.send(:git_config_file_path)
     end
 
     it 'should return the base path with the git config file at the end' do
-      allow(Dir).to receive(:pwd).and_return('/Users/firstnamelastname/path/to/git_helper')
-      expect(subject.send(:git_config_file_path)).to eq('/Users/firstnamelastname/.git_helper/config.yml')
+      user = Faker::Name.first_name
+      allow(Dir).to receive(:pwd).and_return("/Users/#{user}/#{Faker::Lorem.word}")
+      expect(subject.send(:git_config_file_path)).to eq("/Users/#{user}/.git_helper/config.yml")
     end
   end
 end

data/spec/git_helper/highline_cli_spec.rb

@@ -12,7 +12,7 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#new_branch_name' do
-    it "should ask the subject's ask method" do
+    it 'should ask the subjects ask method' do
       expect(subject).to receive(:ask).with('New branch name?')
       subject.new_branch_name
     end
@@ -23,34 +23,34 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#process_directory_remotes' do
-    it "should ask the subject's ask method" do
+    it 'should ask the subjects ask method' do
       expect(subject).to receive(:ask).and_return('y')
-      subject.process_directory_remotes?('directory')
+      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?('directory'))
+      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?('directory')).to eq(true)
+      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?('directory')).to eq(false)
+      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?('directory')).to eq(true)
+      expect(subject.accept_autogenerated_title?(Faker::Lorem.word)).to eq(true)
     end
   end
 
   describe '#conflicting_remote_clarification' do
-    it "should ask the subject's ask method" 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
@@ -61,7 +61,7 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#title' do
-    it "should ask the subject's ask method" do
+    it 'should ask the subjects ask method' do
       expect(subject).to receive(:ask).with('Title?')
       subject.title
     end
@@ -72,7 +72,7 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#base_branch' do
-    it "should ask the subject's ask method" do
+    it 'should ask the subjects ask method' do
       expect(subject).to receive(:ask).with('Base branch?')
       subject.base_branch
     end
@@ -83,92 +83,94 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#code_request_id' do
-    it "should ask the subject's ask method" do
-      expect(subject).to receive(:ask).with('Example Request ID?')
-      subject.code_request_id('Example')
+    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('Example')).to be_a(String)
+      expect(subject.code_request_id(phrase)).to be_a(String)
     end
   end
 
   describe '#accept_autogenerated_title' do
-    it "should ask the subject's ask method" do
+    it 'should ask the subjects ask method' do
       expect(subject).to receive(:ask).and_return('y')
-      subject.accept_autogenerated_title?('Title Example')
+      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?('Title Example'))
+      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?('Title Example')).to eq(true)
+      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?('Title Example')).to eq(false)
+      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?('Title Example')).to eq(true)
+      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?('Title Example')).to eq(false)
+      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?('Title Example')).to eq(true)
+      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(true)
     end
   end
 
   describe '#base_branch_default' do
-    it "should ask the subject's ask method" do
+    it 'should ask the subjects ask method' do
       expect(subject).to receive(:ask).and_return('y')
-      subject.base_branch_default?('default_branch')
+      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?('default_branch'))
+      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?('default_branch')).to eq(true)
+      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?('default_branch')).to eq(false)
+      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?('default_branch')).to eq(true)
+      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?('default_branch')).to eq(false)
+      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?('default_branch')).to eq(true)
+      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(true)
     end
   end
 
   describe '#merge_method' do
-    it "should ask the subject's ask_options 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
@@ -180,7 +182,7 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#template_to_apply' do
-    it "should ask the subject's ask_options method" 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')
     end
@@ -194,22 +196,22 @@ describe GitHelper::HighlineCli do
   describe '#ask' do
     it 'should ask the highline client ask'do
       expect(highline_client).to receive(:ask)
-      subject.send(:ask, 'prompt goes here')
+      subject.send(:ask, Faker::Lorem.sentence)
     end
 
     it 'should return a string' do
-      expect(subject.send(:ask, 'prompt goes here')).to be_a(String)
+      expect(subject.send(:ask, Faker::Lorem.sentence)).to be_a(String)
     end
   end
 
   describe '#ask_options' do
     it 'should ask the highline client ask'do
       expect(highline_client).to receive(:ask)
-      subject.send(:ask_options, 'prompt goes here', ['1', '2', '3'])
+      subject.send(:ask_options, Faker::Lorem.sentence, ['1', '2', '3'])
     end
 
     it 'should return an integer' do
-      expect(subject.send(:ask_options, 'prompt goes here', ['1', '2', '3'])).to be_a(Integer)
+      expect(subject.send(:ask_options, Faker::Lorem.sentence, ['1', '2', '3'])).to be_a(Integer)
     end
   end
 end

data/spec/git_helper/local_code_spec.rb

@@ -4,11 +4,24 @@ require 'git_helper'
 describe GitHelper::LocalCode do
   let(:response) { double(:response, readline: true, to_i: 5) }
   let(:local_codeent) { double(:local_code, ask: response) }
-  let(:ssh_remote) { 'origin\tgit@github.com:emmasax4/git_helper.git (fetch)' }
-  let(:https_remote) { 'origin\thttps://github.com/emmasax4/git_helper.git (fetch)' }
-  let(:github_remotes) { ['origin\tgit@github.com:emmasax4/git_helper.git (fetch)', 'origin\thttps://github.com/emmasax4/git_helper.git (fetch)' ] }
-  let(:gitlab_remotes) { ['origin\tgit@gitlab.com:emmasax4/git_helper.git (fetch)', 'origin\thttps://gitlab.com/emmasax4/git_helper.git (fetch)' ] }
+  let(:project_name) { Faker::Lorem.word }
+  let(:owner) { Faker::Name.first_name }
+  let(:ssh_remote) { "origin\tgit@github.com:#{owner}/#{project_name}.git (fetch)" }
+  let(:https_remote) { "origin\thttps://github.com/#{owner}/#{project_name}.git (fetch)" }
+
+  let(:github_remotes) do
+    [
+      "origin\tgit@github.com:#{owner}/#{project_name}.git (fetch)",
+      "origin\thttps://github.com/#{owner}/#{project_name}.git (fetch)"
+    ]
+  end
 
+  let(:gitlab_remotes) do
+    [
+      "origin\tgit@gitlab.com:#{owner}/#{project_name}.git (fetch)",
+      "origin\thttps://gitlab.com/#{owner}/#{project_name}.git (fetch)"
+    ]
+  end
 
   subject { GitHelper::LocalCode.new }
 
@@ -51,13 +64,14 @@ describe GitHelper::LocalCode do
   describe '#new_branch' do
     it 'should make a system call' do
       expect(subject).to receive(:system).exactly(4).times
-      subject.new_branch('branch_name')
+      subject.new_branch(Faker::Lorem.word)
     end
   end
 
   describe '#change_remote' do
     it 'should return a string' do
-      expect(subject.change_remote('name', 'url')).to be_a(String)
+      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
 
@@ -96,11 +110,11 @@ describe GitHelper::LocalCode do
 
   describe '#remote_project' do
     it 'should return just the plain project if ssh' do
-      expect(subject.remote_project(ssh_remote)).to eq('git_helper')
+      expect(subject.remote_project(ssh_remote)).to eq(project_name)
     end
 
     it 'should return just the plain project if https' do
-      expect(subject.remote_project(https_remote)).to eq('git_helper')
+      expect(subject.remote_project(https_remote)).to eq(project_name)
     end
   end
 
@@ -144,8 +158,8 @@ describe GitHelper::LocalCode do
     end
 
     it 'should equal this project name' do
-      allow_any_instance_of(String).to receive(:scan).and_return([['emmasax4/git_helper']])
-      expect(subject.project_name).to eq('emmasax4/git_helper')
+      allow_any_instance_of(String).to receive(:scan).and_return([["#{owner}/#{project_name}"]])
+      expect(subject.project_name).to eq("#{owner}/#{project_name}")
     end
   end
 
@@ -164,6 +178,7 @@ describe GitHelper::LocalCode do
   describe '#template_options' do
     let(:template_identifiers) do
       {
+        template_directory: '.github',
         nested_directory_name: 'PULL_REQUEST_TEMPLATE',
         non_nested_file_name: 'pull_request_template'
       }
@@ -189,43 +204,65 @@ describe GitHelper::LocalCode do
 
   describe '#generate_title' do
     it 'should return a title based on the branch' do
-      branch = 'jira-123-test-branch'
-      expect(subject.generate_title(branch)).to eq('JIRA-123 Test branch')
+      prefix = Faker::Lorem.word
+      word1 = Faker::Lorem.word
+      word2 = Faker::Lorem.word
+      description = [word1, word2].join('-')
+      branch = "#{prefix}-123-#{description}"
+      expect(subject.generate_title(branch)).to eq("#{prefix.upcase}-123 #{[word1.capitalize, word2].join(' ')}")
     end
 
     it 'should return a title based on the branch' do
-      branch = 'jira_123_test_branch'
-      expect(subject.generate_title(branch)).to eq('JIRA-123 Test branch')
+      prefix = Faker::Lorem.word
+      word1 = Faker::Lorem.word
+      word2 = Faker::Lorem.word
+      description = [word1, word2].join('_')
+      branch = "#{prefix}_123_#{description}"
+      expect(subject.generate_title(branch)).to eq("#{prefix.upcase}-123 #{[word1.capitalize, word2].join(' ')}")
     end
 
     it 'should return a title based on the branch' do
-      branch = 'jira-123_test_branch'
-      expect(subject.generate_title(branch)).to eq('JIRA-123 Test branch')
+      prefix = Faker::Lorem.word
+      word1 = Faker::Lorem.word
+      word2 = Faker::Lorem.word
+      description = [word1, word2].join('_')
+      branch = "#{prefix}-123_#{description}"
+      expect(subject.generate_title(branch)).to eq("#{prefix.upcase}-123 #{[word1.capitalize, word2].join(' ')}")
     end
 
     it 'should return a title based on the branch' do
-      branch = 'test_branch'
-      expect(subject.generate_title(branch)).to eq('Test branch')
+      word1 = Faker::Lorem.word
+      word2 = Faker::Lorem.word
+      branch = [word1, word2].join('_')
+      expect(subject.generate_title(branch)).to eq([word1.capitalize, word2].join(' '))
     end
 
     it 'should return a title based on the branch' do
-      branch = 'test-branch'
-      expect(subject.generate_title(branch)).to eq('Test branch')
+      word1 = Faker::Lorem.word
+      word2 = Faker::Lorem.word
+      branch = [word1, word2].join('-')
+      expect(subject.generate_title(branch)).to eq([word1.capitalize, word2].join(' '))
     end
 
     it 'should return a title based on the branch' do
-      branch = 'test'
-      expect(subject.generate_title(branch)).to eq('Test')
+      branch = Faker::Lorem.word
+      expect(subject.generate_title(branch)).to eq(branch.capitalize)
     end
 
     it 'should return a title based on the branch' do
-      branch = 'some_other_words_in_this_test_branch'
-      expect(subject.generate_title(branch)).to eq('Some other words in this test branch')
+      word1 = Faker::Lorem.word
+      word2 = Faker::Lorem.word
+      word3 = Faker::Lorem.word
+      branch = [word1, word2, word3].join('_')
+      expect(subject.generate_title(branch)).to eq([word1.capitalize, word2, word3].join(' '))
     end
 
     it 'should return a title based on the branch' do
-      branch = 'some-other-words-in-this-test-branch'
-      expect(subject.generate_title(branch)).to eq('Some other words in this test branch')
+      word1 = Faker::Lorem.word
+      word2 = Faker::Lorem.word
+      word3 = Faker::Lorem.word
+      branch = [word1, word2, word3].join('-')
+      expect(subject.generate_title(branch)).to eq([word1.capitalize, word2, word3].join(' '))
     end
   end
 end

data/spec/git_helper/merge_request_spec.rb

@@ -2,23 +2,34 @@ require 'spec_helper'
 require 'git_helper'
 
 describe GitHelper::GitLabMergeRequest do
-  let(:local_code) { double(:local_code, read_template: 'template') }
+  let(:local_code) { double(:local_code, read_template: Faker::Lorem.word) }
   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
     {
-      local_project: 'emmasax4/git_helper',
-      local_branch: 'main',
+      local_project: Faker::Lorem.word,
+      local_branch: Faker::Lorem.word,
       local_code: local_code,
       cli: highline_cli
     }
   end
 
-  subject { GitHelper::GitLabMergeRequest.new(options) }
+  subject { described_class.new(options) }
 
   before do
     allow(GitHelper::GitLabClient).to receive(:new).and_return(gitlab_client)
+    allow(subject).to receive(:puts)
   end
 
   describe '#create' do
@@ -26,16 +37,16 @@ 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)
-      subject.create({base_branch: 'base', new_title: 'title'})
+      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
 
     it 'should call various other methods' 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)
-      subject.create({base_branch: 'base', new_title: 'title'})
+      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
 
     it 'should catch the raised error if the creation does not work' do
@@ -43,36 +54,36 @@ describe GitHelper::GitLabMergeRequest do
       allow(subject).to receive(:remove_source_branch).and_return(false)
       allow(subject).to receive(:new_mr_body).and_return('')
       allow(gitlab_client_client).to receive(:create_merge_request).and_raise(StandardError)
-      expect(subject.create({base_branch: 'base', new_title: 'title'})).to eq(nil)
+      expect(subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})).to eq(nil)
     end
   end
 
   describe '#merge' 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(123)
-      expect(gitlab_client_client).to receive(:accept_merge_request)
+      allow(subject).to receive(:mr_id).and_return(Faker::Number.number)
+      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(123).at_least(:once)
-      allow(gitlab_client_client).to receive(:accept_merge_request)
+      expect(subject).to receive(:mr_id).and_return(Faker::Number.number).at_least(:once)
+      allow(gitlab_client_client).to receive(:accept_merge_request).and_return(merge_request)
       subject.merge
     end
 
     it 'should catch the raised error if the merge does not work' 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(123)
+      allow(subject).to receive(:mr_id).and_return(Faker::Number.number)
       allow(gitlab_client_client).to receive(:accept_merge_request).and_raise(StandardError)
       expect(subject.merge).to eq(nil)
     end
 
     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(123)
-      expect(gitlab_client_client).to receive(:accept_merge_request).and_return(double(merge_commit_sha: nil)).exactly(2).times
+      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, merge_error: Faker::Lorem.word)).exactly(2).times
       expect(subject.merge).to eq(nil)
     end
   end
@@ -105,40 +116,45 @@ describe GitHelper::GitLabMergeRequest do
     end
 
     context 'if there is one template option' do
+      let(:template) { Faker::Lorem.word }
+
       it 'should call the CLI to ask about a single template' do
-        allow(subject).to receive(:mr_template_options).and_return(['template1'])
+        allow(subject).to receive(:mr_template_options).and_return([template])
         expect(highline_cli).to receive(:apply_template?).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(['template1'])
+        allow(subject).to receive(:mr_template_options).and_return([template])
         allow(highline_cli).to receive(:apply_template?).and_return(true)
-        expect(subject.send(:template_name_to_apply)).to eq('template1')
+        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(['template1'])
+        allow(subject).to receive(:mr_template_options).and_return([template])
         allow(highline_cli).to receive(:apply_template?).and_return(false)
         expect(subject.send(:template_name_to_apply)).to eq(nil)
       end
     end
 
     context 'if there are multiple template options' do
+      let(:template1) { Faker::Lorem.word }
+      let(:template2) { Faker::Lorem.word }
+
       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')
+        allow(subject).to receive(:mr_template_options).and_return([template1, template2])
+        expect(highline_cli).to receive(:template_to_apply).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')
-        expect(subject.send(:template_name_to_apply)).to eq('template1')
+        allow(subject).to receive(:mr_template_options).and_return([template1, template2])
+        allow(highline_cli).to receive(:template_to_apply).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(subject).to receive(:mr_template_options).and_return([template1, template2])
         allow(highline_cli).to receive(:template_to_apply).and_return('None')
         expect(subject.send(:template_name_to_apply)).to eq(nil)
       end
@@ -154,13 +170,14 @@ 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(123)
+      expect(highline_cli).to receive(:code_request_id).and_return(Faker::Number.number)
       subject.send(:mr_id)
     end
 
     it 'should equal an integer' do
-      expect(highline_cli).to receive(:code_request_id).and_return(123)
-      expect(subject.send(:mr_id)).to eq(123)
+      pr_id = Faker::Number.number
+      expect(highline_cli).to receive(:code_request_id).and_return(pr_id)
+      expect(subject.send(:mr_id)).to eq(pr_id)
     end
   end
 
@@ -198,12 +215,12 @@ describe GitHelper::GitLabMergeRequest do
       subject.send(:remove_source_branch)
     end
 
-    it "should return the existing project's setting if it exists" 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: true))
       expect(subject.send(:remove_source_branch)).to eq(true)
     end
 
-    it "should return the existing project's setting if it exists" 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)
       expect(subject.send(:remove_source_branch)).to eq(true)
@@ -219,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(123)
+      allow(highline_cli).to receive(:code_request_id).and_return(Faker::Number.number)
       expect(gitlab_client_client).to receive(:merge_request).and_return(:merge_request)
       subject.send(:existing_mr)
     end