git_helper 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34ec4f36cbe8b3cf3875894ee4670a5ca704ce4f67abeac7df2d5778f48a474f
-  data.tar.gz: 51721de128e9639c61c321ef0454c141cad5f91f4ec52ef5aa2161e6bb531c32
+  metadata.gz: 59ea066ec1e5cc797d676571c908c55fcc6de186590f5f1d1f14bb5f3ebfe1c5
+  data.tar.gz: 31c8412273b1e46d5f181e7a01bac5b10858f848293fe287c357f768e41ab90e
 SHA512:
-  metadata.gz: 6f2a22415758219d80055e4ebdb0b954f49bdfb27d2023badea8d0f45e2be151e16d0683c351fd1dd890f7ef864ee5e4291d545af369936e1d65ee0ff14195b4
-  data.tar.gz: e2bdae4669a0331f84ecc50c7f60b1af00e987556ec2644abbe4c0e44cd45185c16820f4d508c451ad4883adf4e19c4a5dac89670bb6b500c2a700ffd0214ac4
+  metadata.gz: 16b7f3b1a77e5a2cae432fcddc556425a18ce88ae6a7147814810af49e42ebe61ca1a82daf691165ef62f7315b10442fcf8c3b458440075b8b767090b5fe560b
+  data.tar.gz: dd940ec200f5275c5f07b1b91c5e504bc545b177580ab6c059e64d988438001b186ced83af14a2022e14f9526a0d69fe01989eabd7290bf5378de3560ede5968

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_helper (3.0.0)
+    git_helper (3.0.1)
       gitlab (~> 4.16)
       gli (~> 2.13)
       highline (~> 2.0)
@@ -13,9 +13,13 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     coderay (1.1.3)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.4.4)
-    faraday (1.0.1)
+    faker (2.14.0)
+      i18n (>= 1.6, < 2)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
     ffi (1.13.1)
     formatador (0.2.5)
     gitlab (4.16.1)
@@ -40,6 +44,8 @@ GEM
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -47,14 +53,14 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
+    mime-types-data (3.2020.1104)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.18.0)
+    octokit (4.19.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     pry (0.13.1)
@@ -65,19 +71,20 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    ruby2_keywords (0.0.2)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -92,6 +99,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.1)
+  faker
   git_helper!
   guard-rspec (~> 4.3)
   rake (~> 13.0)

data/Guardfile

@@ -1,5 +1,5 @@
 guard :rspec, cmd: 'bundle exec rspec', all_on_start: true, all_after_pass: true  do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+  watch('spec/spec_helper.rb')  { 'spec' }
 end

data/README.md

@@ -1,4 +1,4 @@
-# git_helper [![Maintainability](https://api.codeclimate.com/v1/badges/d53da11f17c38cc81b5b/maintainability)](https://codeclimate.com/github/emmasax4/git_helper/maintainability) ![Develop](https://github.com/emmasax4/git_helper/workflows/Develop/badge.svg)
+# git_helper [![Maintainability](https://api.codeclimate.com/v1/badges/d53da11f17c38cc81b5b/maintainability)](https://codeclimate.com/github/emmasax4/git_helper/maintainability) ![Default](https://github.com/emmasax4/git_helper/workflows/Default/badge.svg)
 
 ## Gem Usage
 

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/bin/git-helper

@@ -27,7 +27,7 @@ command 'change-remote' do |c|
   end
 end
 
-desc "Checks out the default branch of a repo based on the local remote branches."
+desc 'Checks out the default branch of a repo based on the local remote branches.'
 command 'checkout-default' do |c|
   c.action do |global_options, options, args|
     GitHelper::CheckoutDefault.new.execute
@@ -41,14 +41,14 @@ command 'clean-branches' do |c|
   end
 end
 
-desc "Creates an empty commit with a basic commit message."
+desc 'Creates an empty commit with a basic commit message.'
 command 'empty-commit' do |c|
   c.action do |global_options, options, args|
     GitHelper::EmptyCommit.new.execute
   end
 end
 
-desc "Reset your local git commits to origin/HEAD."
+desc 'Reset your local git commits to origin/HEAD.'
 command 'forget-local-commits' do |c|
   c.action do |global_options, options, args|
     GitHelper::ForgetLocalCommits.new.execute

data/lib/git_helper.rb

@@ -1,4 +1,9 @@
-Dir[File.expand_path(File.join(File.dirname(File.absolute_path(__FILE__)), 'git_helper')) + "/**/*.rb"].each do |file|
+require 'yaml'
+require 'gitlab'
+require 'highline'
+require 'octokit'
+
+Dir[File.expand_path(File.join(File.dirname(File.absolute_path(__FILE__)), 'git_helper')) + '/**/*.rb'].each do |file|
   require_relative file
 end
 

data/lib/git_helper/git_config_reader.rb

@@ -1,5 +1,3 @@
-require 'yaml'
-
 module GitHelper
   class GitConfigReader
     def gitlab_token

data/lib/git_helper/gitlab_client.rb

@@ -1,5 +1,3 @@
-require 'gitlab'
-
 module GitHelper
   class GitLabClient
     def client

data/lib/git_helper/highline_cli.rb

@@ -1,5 +1,3 @@
-require 'highline'
-
 module GitHelper
   class HighlineCli
     def new_branch_name

data/lib/git_helper/local_code.rb

@@ -1,27 +1,27 @@
 module GitHelper
   class LocalCode
     def checkout_default
-      system("git checkout $(git symbolic-ref refs/remotes/origin/HEAD | sed \"s@^refs/remotes/origin/@@\")")
+      system('git checkout $(git symbolic-ref refs/remotes/origin/HEAD | sed "s@^refs/remotes/origin/@@")')
     end
 
     def forget_local_commits
-      system("git pull")
-      system("git reset --hard origin/HEAD")
+      system('git pull')
+      system('git reset --hard origin/HEAD')
     end
 
     def empty_commit
-      system("git commit --allow-empty -m \"Empty commit\"")
+      system('git commit --allow-empty -m \"Empty commit\"')
     end
 
     def clean_branches
-      system("git checkout $(git symbolic-ref refs/remotes/origin/HEAD | sed \"s@^refs/remotes/origin/@@\")")
-      system("git pull")
-      system("git fetch -p")
-      system("git branch -vv | grep \"origin/.*: gone]\" | awk '{print \$1}' | grep -v \"*\" | xargs git branch -D")
+      system('git checkout $(git symbolic-ref refs/remotes/origin/HEAD | sed "s@^refs/remotes/origin/@@")')
+      system('git pull')
+      system('git fetch -p')
+      system('git branch -vv | grep "origin/.*: gone]" | awk "{print \$1}" | grep -v "*" | xargs git branch -D')
     end
 
     def new_branch(branch_name)
-      system("git pull")
+      system('git pull')
       system("git branch --no-track #{branch_name}")
       system("git checkout #{branch_name}")
       system("git push --set-upstream origin #{branch_name}")

data/lib/git_helper/octokit_client.rb

@@ -1,5 +1,3 @@
-require 'octokit'
-
 module GitHelper
   class OctokitClient
     def client

data/lib/git_helper/version.rb

@@ -1,3 +1,3 @@
 module GitHelper
-  VERSION = '3.0.1'
+  VERSION = '3.1.0'
 end

data/spec/git_helper/change_remote_spec.rb

@@ -2,22 +2,24 @@ require 'spec_helper'
 require 'git_helper'
 
 describe GitHelper::ChangeRemote do
-  let(:remote1) { 'git@github.com:github-username-old/project-1.git' }
+  let(:remote1) { "git@github.com:#{old_owner}/#{project}.git" }
+  let(:project) { Faker::Lorem.word }
+  let(:cli) { double(:highline_cli, process_directory_remotes?: true) }
+  let(:old_owner) { Faker::Internet.username }
+  let(:new_owner) { Faker::Internet.username }
+  let(:directory_entries) { [ '.', '..', project, Faker::Lorem.word, Faker::Lorem.word ] }
+
   let(:local_code) do
     double(:local_code,
       remotes: [remote1],
-      remote_name: 'origin',
+      remote_name: Faker::Lorem.word,
       ssh_remote?: true,
       https_remote?: false,
-      remote_project: 'project-1',
+      remote_project: project,
       remote_source: 'github.com',
       change_remote: true
     )
   end
-  let(:cli) { double(:highline_cli, process_directory_remotes?: true) }
-  let(:old_owner) { 'github-username-old' }
-  let(:new_owner) { 'github-username-new' }
-  let(:directory_entries) { [ '.', '..', 'project-1', 'project-2', 'project-3' ] }
 
   subject { GitHelper::ChangeRemote.new(old_owner, new_owner) }
 
@@ -28,9 +30,9 @@ describe GitHelper::ChangeRemote do
 
   describe '#execute' do
     before do
-      allow(Dir).to receive(:pwd).and_return('/Users/firstname/lastname/path/to/project')
+      allow(Dir).to receive(:pwd).and_return("/Users/#{Faker::Name.first_name}/#{project}")
       allow(Dir).to receive(:entries).and_return(directory_entries)
-      allow(File).to receive(:join).and_return('/Users/firstname/lastname/path/to/project/project-1')
+      allow(File).to receive(:join).and_return("/Users/#{Faker::Name.first_name}/#{project}/#{Faker::Lorem.word}")
       allow(File).to receive(:directory?).and_return(true)
       allow(subject).to receive(:process_dir)
     end
@@ -59,13 +61,13 @@ describe GitHelper::ChangeRemote do
     it 'should definitely look in the file structure' do
       expect(Dir).to receive(:chdir)
       expect(File).to receive(:exist?)
-      subject.send(:process_dir, '/Users/firstname/lastname/path/to/project', '/Users/firstname/lastname/path/to/project/project-1')
+      subject.send(:process_dir, "/Users/#{Faker::Name.first_name}/#{project}", "/Users/#{Faker::Name.first_name}/#{project}/#{Faker::Lorem.word}")
     end
 
     context 'when the user says to process the directory' do
       it 'should call to process the git repository at least once' do
         expect(subject).to receive(:process_git_repository).at_least(:once)
-        subject.send(:process_dir, '/Users/firstname/lastname/path/to/project', '/Users/firstname/lastname/path/to/project/project-1')
+        subject.send(:process_dir, "/Users/#{Faker::Name.first_name}/#{project}", "/Users/#{Faker::Name.first_name}/#{project}/#{Faker::Lorem.word}")
       end
     end
 
@@ -74,7 +76,7 @@ describe GitHelper::ChangeRemote do
 
       it 'should not call to process the directory' do
         expect(subject).not_to receive(:process_git_repository)
-        subject.send(:process_dir, '/Users/firstname/lastname/path/to/project', '/Users/firstname/lastname/path/to/project/project-1')
+        subject.send(:process_dir, "/Users/#{Faker::Name.first_name}/#{project}", "/Users/#{Faker::Name.first_name}/#{project}/#{Faker::Lorem.word}")
       end
     end
   end
@@ -97,7 +99,7 @@ describe GitHelper::ChangeRemote do
     end
 
     context 'when the remote does not include the old owner' do
-      let(:remote1) { 'git@github.com:github-username-new/project-1.git' }
+      let(:remote1) { "git@github.com:#{new_owner}/#{project}.git" }
 
       it 'should not call to process the remote' do
         expect(subject).not_to receive(:process_remote)
@@ -136,10 +138,10 @@ describe GitHelper::ChangeRemote do
       let(:local_code) do
         double(:local_code,
           remotes: [remote1],
-          remote_name: 'origin',
+          remote_name: Faker::Lorem.word,
           ssh_remote?: false,
           https_remote?: false,
-          remote_project: 'project-1',
+          remote_project: project,
           remote_source: 'github.com',
           change_remote: true
         )

data/spec/git_helper/code_request_spec.rb

@@ -3,8 +3,10 @@ require 'git_helper'
 
 describe GitHelper::CodeRequest do
   let(:highline_cli) { double(:highline_cli) }
-  let(:local_code) { double(:local_code, project_name: 'name', branch: 'branch') }
+  let(:local_code) { double(:local_code, project_name: Faker::Lorem.word, branch: Faker::Lorem.word) }
   let(:process_project) { double(:process_project, create: :created, merge: :merged) }
+  let(:base_branch) { Faker::Lorem.word }
+  let(:title) { Faker::Lorem.sentence }
 
   subject { GitHelper::CodeRequest.new }
 
@@ -15,8 +17,8 @@ describe GitHelper::CodeRequest do
 
   describe '#create' do
     before do
-      allow(subject).to receive(:base_branch).and_return('base')
-      allow(subject).to receive(:new_code_request_title).and_return('Title')
+      allow(subject).to receive(:base_branch).and_return(base_branch)
+      allow(subject).to receive(:new_code_request_title).and_return(title)
     end
 
     it 'should call to process the project' do
@@ -31,8 +33,8 @@ describe GitHelper::CodeRequest do
     end
 
     it 'should call base_branch and new_code_request_title' do
-      expect(subject).to receive(:base_branch).and_return('base')
-      expect(subject).to receive(:new_code_request_title).and_return('Title')
+      expect(subject).to receive(:base_branch).and_return(base_branch)
+      expect(subject).to receive(:new_code_request_title).and_return(title)
       allow(subject).to receive(:process_project).and_return(process_project)
       allow(process_project).to receive(:create)
       subject.create
@@ -132,7 +134,7 @@ describe GitHelper::CodeRequest do
 
     context 'when response is neither' do
       it 'should raise an error' do
-        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return('huh?')
+        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return(Faker::Lorem.word)
         expect(subject).to receive(:exit)
         subject.send(:ask_for_clarification)
       end
@@ -171,28 +173,28 @@ describe GitHelper::CodeRequest 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')
+      allow(highline_cli).to receive(:base_branch).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')
+      allow(highline_cli).to receive(:base_branch).at_least(:once).and_return(base_branch)
       subject.send(:base_branch)
     end
 
     context 'if the user says no' do
-      it "definitely asks for the user's base branch" 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')
+        expect(highline_cli).to receive(:base_branch).at_least(:once).and_return(base_branch)
         subject.send(:base_branch)
       end
     end
 
     context 'if the user says yes' do
-      it "does not ask for the user's base branch" 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).not_to receive(:base_branch)
@@ -203,7 +205,7 @@ describe GitHelper::CodeRequest do
 
   describe '#autogenerated_title' do
     it 'should generate a title based on the branch' do
-      expect(subject).to receive(:local_branch).and_return('branch')
+      expect(subject).to receive(:local_branch).and_return(Faker::Lorem.word)
       expect(local_code).to receive(:generate_title)
       subject.send(:autogenerated_title)
     end
@@ -213,28 +215,28 @@ describe GitHelper::CodeRequest 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(:title).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(highline_cli).to receive(:title).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 user's title" 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')
+        expect(highline_cli).to receive(:title).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 user's chosen 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)

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,13 @@ 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)
+      expect(subject.change_remote(Faker::Lorem.word, Faker::Internet.url)).to be_a(String)
     end
   end
 
@@ -96,11 +109,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 +157,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
 
@@ -190,43 +203,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,20 +2,21 @@ 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(: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)
@@ -27,7 +28,7 @@ describe GitHelper::GitLabMergeRequest do
       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'})
+      subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})
     end
 
     it 'should call various other methods' do
@@ -35,7 +36,7 @@ describe GitHelper::GitLabMergeRequest do
       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'})
+      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,35 +44,35 @@ 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)
+      allow(subject).to receive(:mr_id).and_return(Faker::Number.number)
       expect(gitlab_client_client).to receive(:accept_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)
+      expect(subject).to receive(:mr_id).and_return(Faker::Number.number).at_least(:once)
       allow(gitlab_client_client).to receive(:accept_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)
+      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(subject.merge).to eq(nil)
     end
@@ -105,40 +106,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 +160,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 +205,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 +226,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

data/spec/git_helper/pull_request_spec.rb

@@ -2,14 +2,15 @@ require 'spec_helper'
 require 'git_helper'
 
 describe GitHelper::GitHubPullRequest 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(:octokit_client_client) { double(:octokit_client_client, project: :project, merge_request: :merge_request, create_merge_request: :created) }
   let(:octokit_client) { double(:octokit_client, client: octokit_client_client) }
+
   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
     }
@@ -25,43 +26,43 @@ describe GitHelper::GitHubPullRequest do
     it 'should call the octokit client to create' do
       allow(subject).to receive(:new_pr_body).and_return('')
       expect(octokit_client_client).to receive(:create_pull_request)
-      subject.create({base_branch: 'base', new_title: 'title'})
+      subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})
     end
 
     it 'should call various other methods' do
       expect(subject).to receive(:new_pr_body).and_return('').at_least(:once)
       allow(octokit_client_client).to receive(:create_pull_request)
-      subject.create({base_branch: 'base', new_title: 'title'})
+      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
       allow(subject).to receive(:new_pr_body).and_return('')
       allow(octokit_client_client).to receive(:create_pull_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 octokit client to merge' do
-      allow(subject).to receive(:existing_pr).and_return(double(title: 'title'))
+      allow(subject).to receive(:existing_pr).and_return(double(title: Faker::Lorem.word))
       allow(subject).to receive(:merge_method).and_return('rebase')
-      allow(subject).to receive(:pr_id).and_return(123)
+      allow(subject).to receive(:pr_id).and_return(Faker::Number.number)
       expect(octokit_client_client).to receive(:merge_pull_request)
       subject.merge
     end
 
     it 'should call various other methods' do
-      expect(subject).to receive(:existing_pr).and_return(double(title: 'title')).at_least(:once)
+      expect(subject).to receive(:existing_pr).and_return(double(title: Faker::Lorem.word)).at_least(:once)
       expect(subject).to receive(:merge_method).and_return('rebase').at_least(:once)
-      expect(subject).to receive(:pr_id).and_return(123).at_least(:once)
+      expect(subject).to receive(:pr_id).and_return(Faker::Number.number).at_least(:once)
       allow(octokit_client_client).to receive(:merge_pull_request)
       subject.merge
     end
 
     it 'should catch the raised error if the merge does not work' do
-      allow(subject).to receive(:existing_pr).and_return(double(title: 'title'))
+      allow(subject).to receive(:existing_pr).and_return(double(title: Faker::Lorem.word))
       allow(subject).to receive(:merge_method).and_return('rebase')
-      allow(subject).to receive(:pr_id).and_return(123)
+      allow(subject).to receive(:pr_id).and_return(Faker::Number.number)
       allow(octokit_client_client).to receive(:merge_pull_request).and_raise(StandardError)
       expect(subject.merge).to eq(nil)
     end
@@ -95,40 +96,45 @@ describe GitHelper::GitHubPullRequest 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(:pr_template_options).and_return(['template1'])
+        allow(subject).to receive(:pr_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(:pr_template_options).and_return(['template1'])
+        allow(subject).to receive(:pr_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(:pr_template_options).and_return(['template1'])
+        allow(subject).to receive(:pr_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(:pr_template_options).and_return(['template1', 'template2'])
-        expect(highline_cli).to receive(:template_to_apply).and_return('template1')
+        allow(subject).to receive(:pr_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(:pr_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(:pr_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(:pr_template_options).and_return(['template1', 'template2'])
+        allow(subject).to receive(:pr_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
@@ -144,13 +150,14 @@ describe GitHelper::GitHubPullRequest do
 
   describe '#pr_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(:pr_id)
     end
 
     it 'should equal an integer' do
-      expect(highline_cli).to receive(:code_request_id).and_return(123)
-      expect(subject.send(:pr_id)).to eq(123)
+      pr_id = Faker::Number.number
+      expect(highline_cli).to receive(:code_request_id).and_return(pr_id)
+      expect(subject.send(:pr_id)).to eq(pr_id)
     end
   end
 
@@ -172,7 +179,7 @@ describe GitHelper::GitHubPullRequest do
       expect(subject.send(:merge_method)).to be_a(String)
     end
 
-    context "if there's only one item" do
+    context 'if theres only one item' do
       let(:project) { double(:project, allow_merge_commit: true, allow_squash_merge: false, allow_rebase_merge: false) }
 
       it 'should not ask the CLI anything' do
@@ -231,7 +238,7 @@ describe GitHelper::GitHubPullRequest do
 
   describe '#existing_pr' do
     it 'should call the octokit 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(octokit_client_client).to receive(:pull_request).and_return(:pull_request)
       subject.send(:existing_pr)
     end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'faker'
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_helper
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Emma Sax
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement