git_helper 3.0.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e4c2767e4d4858d3ed4f8791d0dc82577e9fdf051aff59b1f6516c4f13bd4a4
-  data.tar.gz: 686894c11b437666221793b475cdf81eb1c99437fcc1ee87aef6a3c07d33e9a4
+  metadata.gz: 4b64f4dd497458fd54078d7b1db018ba01273e432e6c0923d1cedad7613631b3
+  data.tar.gz: a6aace888903ea6d61846e8910b24c01e6c2b68a3370da904e89e2ca463118cb
 SHA512:
-  metadata.gz: 32ba80af9ea352cd22c035ecb5e16c2315bae91c9f2b6b3f49a8d5518ffdc4bd533c9b38e6a8652798bd78672e439ba489d8e58346935f3d43ec21dbc3f248ab
-  data.tar.gz: '093a11e7c9d46548ad0127d31c101a1fcf69e0aba7c7a1e4c1873dbebadb78bb2f3791175c3702b081fb36d788c1bb4cbe0149833ee58180f038269eeb1f2523'
+  metadata.gz: 6f696668e2a8e9180d4df1018c36b94cd8bdb288b73c31181dc6a3a9c92150849505a5363c02e862a13e8f239e51ca177c7bd678576d940e9ecd621e154e2de1
+  data.tar.gz: 91c19361c88d9f8b3bc8840f660ea23b14cbf56fe878317f57ab5964a124d5b6150bc97c082a1fcd343a8a5e99f4f65efbcb6858c75e19dddd6a7ee59f67dc41

data/Guardfile

@@ -1,5 +1,5 @@
-guard :rspec, cmd: 'bundle exec rspec', all_on_start: true, all_after_pass: true  do
+guard :rspec, cmd: 'bundle exec rspec', all_on_start: 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
 
@@ -9,13 +9,15 @@ gem install git_helper
 Some of the commands in this gem can be used without any additional configuration. However, others utilize special GitHub or GitLab configuration. To provide access tokens for this, create a `~/.git_helper/config.yml` file. The contents should look like this:
 
 ```
-:github_user: GITHUB-USERNAME
+:github_user:  GITHUB-USERNAME
 :github_token: GITHUB-TOKEN
-:gitlab_user: GITLAB-USERNAME
+:gitlab_user:  GITLAB-USERNAME
 :gitlab_token: GITLAB-TOKEN
 ```
 
-To view the help screen, run:
+To create or see what access tokens you have, look [here for GitHub personal access tokens](https://github.com/settings/tokens) and [here for GitLab access tokens](https://gitlab.com/profile/personal_access_tokens). You could either have one set of tokens for each computer you use, or just have one set of tokens for all computers that you rotate periodically.
+
+Once the gem is installed, run this to view the help screen:
 ```bash
 git-helper --help
 ```
@@ -32,7 +34,7 @@ As an additional option, you can set each of the following commands to be a git
 ```bash
 # As a Gem                            # As a Plugin
 git-helper clean-branches             git clean-branches
-git-helper code-request --create      git code-request --create
+git-helper code-request               git code-request
 ```
 
 To do this, download the `plugins.zip` file in the root of this directory. Unzip and place the contents in the appropriate location:
@@ -108,25 +110,21 @@ git-helper clean-branches
 
 ### `code-request`
 
-This command can be used to handily make new GitHub/GitLab pull/merge requests and to merge those requests from the command line. The command uses either the [`Octokit::Client`](https://octokit.github.io/octokit.rb/Octokit/Client.html) or [`Gitlab` client](https://github.com/NARKOZ/gitlab) to do this, so make sure you have a `~/.git_helper/config.yml` file set up in the home directory of your computer. For instructions on how to do that, see [Gem Usage](#gem-usage).
+This command can be used to handily make new GitHub/GitLab pull/merge requests from the command line. The command uses either the [`Octokit::Client`](https://octokit.github.io/octokit.rb/Octokit/Client.html) or [`Gitlab` client](https://github.com/NARKOZ/gitlab) to do this, so make sure you have a `~/.git_helper/config.yml` file set up in the home directory of your computer. For instructions on how to do that, see [Gem Usage](#gem-usage).
 
-After setup is complete, you can call the file, and send in a flag indicating whether to create a code request, `-c`, or to merge a code request, `-m`.
+After setup is complete, you can call the command like this:
 
 ```bash
-git-helper code-request -c
-# OR
-git-helper code-request -m
+git-helper code-request
 ```
 
-If you're trying to create a code request, the command will provide an autogenerated code request title based on your branch name. It will separate the branch name by `'_'` if underscores are in the branch, or `'-'` if dashes are present. Then it will join the list of words together by spaces. If there's a pattern in the form of `jira-123` or `jira_123` in the first part of the branch name, then it'll add `JIRA-123` to the first part of the code request. You can respond 'yes' or 'no'. If you respond 'no', you can provide your own code request title.
+The command will provide an autogenerated code request title based on your branch name. It will separate the branch name by `'_'` if underscores are in the branch, or `'-'` if dashes are present. Then it will join the list of words together by spaces. If there's a pattern in the form of `jira-123` or `jira_123` in the first part of the branch name, then it'll add `JIRA-123` to the first part of the code request. You can respond 'yes' or 'no'. If you respond 'no', you can provide your own code request title.
 
 The command will also ask you if the default branch of the repository is the proper base branch to use. You can say 'yes' or 'no'. If you respond 'no', then you can give the command your chosen base base.
 
-Lastly, for GitHub, it'll ask the user to apply any code request templates found at any `*/pull_request_template.md` file or any file in `.github/PULL_REQUEST_TEMPLATE/*.md`. Applying any template is optional, and a user can make an empty pull request if they desire. For GitLab, it'll ask the user to apply any merge request templates found at any `*/merge_request_template.md` file or any file in `.gitlab/merge_request_templates/*.md`. Applying any template is optional, and from the command's standpoint, a user can make an empty merge request if they desire. If a GitLab project automatically adds a template, then it may create a merge request with a default template anyway.
+If your project uses GitLab, the command will potentially ask you if you'd like to delete the source branch upon merge. If the project defaults to deleting the source branch, then the script will use that selection, and the value can be changed for a specific MR either over the API or in the browser. If the project just provides source branch deletion as on option, then it'll ask the user. It also will probably ask you if you'd like to squash the MR upon merge. If the project requires or prevents squashing, then whatever answer you give will be _*ignored*_. This is unfortunate, but is here due to limited API functionality.
 
-If you're requesting to merge a code request, the command will ask you the number ID of the code request you wish to merge. For GitHub, the command will also ask you what type of merge to do: regular merging, squashing, or rebasing. The commit message to use during the merge/squash/rebase will be the title of the pull request. For GitLab, the command will also ask you what type of merge to do: regular merging or squashing. The commit message to use during the merge/squash will be the title of the merge request.
-
-If you're getting stuck, you can run the command with a `--help` flag instead, to get some more information.
+Lastly, it'll ask about code request templates. For GitHub, it'll ask the user to apply any pull request templates found at `.github/pull_request_template.md`, `./pull_request_template.md`, or `.github/PULL_REQUEST_TEMPLATE/*.md`. Applying any template is optional, and a user can make an empty pull request if they desire. For GitLab, it'll ask the user to apply any merge request templates found at any `.gitlab/merge_request_template.md`, `./merge_request_template.md`, or `.gitlab/merge_request_templates/*.md`. Applying any template is optional, and from the command's standpoint, a user can make an empty merge request if they desire (although GitLab may still add a merge request template if the project itself requires one). When searching for templates, the code ignores cases, so the file could be named with all capital letters or all lowercase letters.
 
 ### `empty-commit`
 
@@ -144,6 +142,23 @@ This command is handy if you locally have a bunch of commits you wish to complet
 git-helper forget-local-commits
 ```
 
+### `merge-code-request`
+
+This command can be used to merge pull/merge requests from the command line. The command uses either the [`Octokit::Client`](https://octokit.github.io/octokit.rb/Octokit/Client.html) or [`Gitlab` client](https://github.com/NARKOZ/gitlab) to do this, so make sure you have a `~/.git_helper/config.yml` file set up in the home directory of your computer. For instructions on how to do that, see [Gem Usage](#gem-usage).
+
+After setup is complete, you can call the proper command like this:
+
+```bash
+git-helper merge-code-request
+```
+
+The command will ask you the number ID of the code request you wish to merge.
+
+If using GitHub _and_ the repository allows multiple types of merges (merge/squash/rebase), then the command will ask the user what type of merge to do. It'll only let users select a type of merge the repository allows. If a repository only allows one type of merging, then the command will automatically use that. The commit message to use during the merge/squash/rebase will be the title of the pull request.
+
+For GitLab, the command will use whatever squash/source branch deletion/etc settings are already set on the merge request, so make sure you click the proper checkboxes in the MR manually or over the API before running this command. The commit message to use during the merge/squash will be the title of the merge request.
+
+
 ### `new-branch`
 
 This command is useful for making new branches in a repository on the command line. To run the command, run:
@@ -162,7 +177,7 @@ To submit a feature request, bug ticket, etc, please submit an official [GitHub
 
 To report any security vulnerabilities, please view this project's [Security Policy](https://github.com/emmasax4/git_helper/security/policy).
 
-This repository does have a standard [Code of Conduct](https://github.com/emmasax4/git_helper/blob/main/.github/code_of_conduct.md).
+When interacting with this repository, please follow [Contributor Covenant's Code of Conduct](https://contributor-covenant.org).
 
 ## Releasing
 

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
@@ -63,21 +63,17 @@ command 'new-branch' do |c|
   end
 end
 
-desc 'Create or merge a GitHub or GitLab pull/merge request from the current branch. The command will figure out whether your code project belongs to GitHub or GitLab'
-command 'code-request' do |c|
-  c.switch [:c, :create], desc: 'Create a new pull/merge request'
-  c.switch [:m, :merge], desc: 'Merge an existing pull/merge request'
-
+desc 'Merge a GitHub/GitLab pull/merge request. The command will figure out whether your code project belongs to GitHub or GitLab.'
+command 'merge-code-request' do |c|
   c.action do |global_options, options, args|
-    raise ArgumentError, "You must specify an action (either '-m'/'--merge' or '-c'/'--create')" unless options[:create] || options[:merge]
-
-    options = global_options.merge(options)
+    GitHelper::CodeRequest.new.merge
+  end
+end
 
-    if options[:create]
-      GitHelper::CodeRequest.new.create
-    elsif options[:merge]
-      GitHelper::CodeRequest.new.merge
-    end
+desc 'Create a GitHub/GitLab pull/merge request from the current branch. The command will figure out whether your code project belongs to GitHub or GitLab.'
+command 'code-request' do |c|
+  c.action do |global_options, options, args|
+    GitHelper::CodeRequest.new.create
   end
 end
 

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}")
@@ -85,16 +85,20 @@ module GitHelper
       `git symbolic-ref refs/remotes/origin/HEAD | sed "s@^refs/remotes/origin/@@" | tr -d "\n"`
     end
 
-    def template_options(template_identifiers)
+    def template_options(identifiers)
       nested_templates = Dir.glob(
-        File.join("**/#{template_identifiers[:nested_directory_name]}", "*.md"),
+        File.join("#{identifiers[:template_directory]}/#{identifiers[:nested_directory_name]}", '*.md'),
         File::FNM_DOTMATCH | File::FNM_CASEFOLD
       )
       non_nested_templates = Dir.glob(
-        File.join("**", "#{template_identifiers[:non_nested_file_name]}.md"),
+        File.join(identifiers[:template_directory], "#{identifiers[:non_nested_file_name]}.md"),
         File::FNM_DOTMATCH | File::FNM_CASEFOLD
       )
-      nested_templates.concat(non_nested_templates).uniq
+      root_templates = Dir.glob(
+        File.join('.', "#{identifiers[:non_nested_file_name]}.md"),
+        File::FNM_DOTMATCH | File::FNM_CASEFOLD
+      )
+      nested_templates.concat(non_nested_templates).concat(root_templates).uniq
     end
 
     def read_template(file_name)

data/lib/git_helper/merge_request.rb

@@ -97,6 +97,7 @@ module GitHelper
 
     private def mr_template_options
       @mr_template_options ||= local_code.template_options({
+                                 template_directory: '.gitlab',
                                  nested_directory_name: 'merge_request_templates',
                                  non_nested_file_name: 'merge_request_template'
                                })

data/lib/git_helper/octokit_client.rb

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

data/lib/git_helper/pull_request.rb

@@ -94,6 +94,7 @@ module GitHelper
 
     private def pr_template_options
       @pr_template_options ||= local_code.template_options({
+                                 template_directory: '.github',
                                  nested_directory_name: 'PULL_REQUEST_TEMPLATE',
                                  non_nested_file_name: 'pull_request_template'
                                })

data/lib/git_helper/version.rb

@@ -1,3 +1,3 @@
 module GitHelper
-  VERSION = '3.0.0'
+  VERSION = '3.2.0'
 end

data/spec/git_helper/change_remote_spec.rb

@@ -2,35 +2,38 @@ 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) }
 
   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
     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 +62,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 +77,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 +100,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 +139,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,20 +3,23 @@ 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 }
 
   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
     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 +34,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 +135,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 +174,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 +206,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 +216,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)