git_helper 3.0.1 → 3.2.1

data/lib/git_helper/merge_request.rb

@@ -84,10 +84,10 @@ module GitHelper
 
       unless mr_template_options.empty?
         if mr_template_options.count == 1
-          apply_single_template = cli.apply_template?(mr_template_options.first, 'merge')
+          apply_single_template = cli.ask_yes_no("Apply the merge request template from #{mr_template_options.first}? (y/n)")
           @template_name_to_apply = mr_template_options.first if apply_single_template
         else
-          response = cli.template_to_apply(mr_template_options, 'merge')
+          response = cli.ask_options("Which merge request template should be applied?", mr_template_options << 'None')
           @template_name_to_apply = response unless response == 'None'
         end
       end
@@ -104,15 +104,15 @@ module GitHelper
     end
 
     private def mr_id
-      @mr_id ||= cli.code_request_id('Merge')
+      @mr_id ||= cli.ask('Merge Request ID?')
     end
 
     private def squash_merge_request
-      @squash_merge_request ||= cli.squash_merge_request?
+      @squash_merge_request ||= cli.ask_yes_no('Squash merge request? (y/n)')
     end
 
     private def remove_source_branch
-      @remove_source_branch ||= existing_project.remove_source_branch_after_merge || cli.remove_source_branch?
+      @remove_source_branch ||= existing_project.remove_source_branch_after_merge || cli.ask_yes_no('Remove source branch after merging? (y/n)')
     end
 
     private def existing_project

data/lib/git_helper/new_branch.rb

@@ -1,7 +1,7 @@
 module GitHelper
   class NewBranch
     def execute(new_branch_name = nil)
-      branch_name = new_branch_name || GitHelper::HighlineCli.new.new_branch_name
+      branch_name = new_branch_name || GitHelper::HighlineCli.new.ask('New branch name?')
       puts "Attempting to create a new branch: #{branch_name}"
       GitHelper::LocalCode.new.new_branch(branch_name)
     end

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

@@ -81,10 +81,10 @@ module GitHelper
 
       unless pr_template_options.empty?
         if pr_template_options.count == 1
-          apply_single_template = cli.apply_template?(pr_template_options.first, 'pull')
+          apply_single_template = cli.ask_yes_no("Apply the pull request template from #{pr_template_options.first}? (y/n)")
           @template_name_to_apply = pr_template_options.first if apply_single_template
         else
-          response = cli.template_to_apply(pr_template_options, 'pull')
+          response = cli.ask_options("Which pull request template should be applied?", pr_template_options << 'None')
           @template_name_to_apply = response unless response == 'None'
         end
       end
@@ -101,11 +101,11 @@ module GitHelper
     end
 
     private def pr_id
-      @pr_id ||= cli.code_request_id('Pull')
+      @pr_id ||= cli.ask('Pull Request ID?')
     end
 
     private def merge_method
-      @merge_method ||= merge_options.length == 1 ? merge_options.first : cli.merge_method(merge_options)
+      @merge_method ||= merge_options.length == 1 ? merge_options.first : cli.ask_options('Merge method?', merge_options)
     end
 
     private def merge_options

data/lib/git_helper/version.rb

@@ -1,3 +1,3 @@
 module GitHelper
-  VERSION = '3.0.1'
+  VERSION = '3.2.1'
 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, ask_yes_no: true) }
+  let(:old_owner) { Faker::Internet.username }
+  let(:new_owner) { Faker::Internet.username }
+  let(:directory_entries) { [ '.', '..', project, Faker::Lorem.word, Faker::Lorem.word ] }
+
   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,22 +62,22 @@ 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
 
     context 'when the user says not to process the directory' do
-      let(:cli) { double(:highline_cli, process_directory_remotes?: false) }
+      let(:cli) { double(:highline_cli, ask_yes_no: false) }
 
       it 'should not call to process the directory' do
         expect(subject).not_to receive(:process_git_repository)
-        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
@@ -98,19 +101,19 @@ describe GitHelper::CodeRequest do
 
   describe '#ask_for_clarification' do
     it 'should ask the CLI' do
-      expect(highline_cli).to receive(:conflicting_remote_clarification).and_return('github')
+      expect(highline_cli).to receive(:ask).and_return('github')
       subject.send(:ask_for_clarification)
     end
 
     context 'when response is github' do
       it 'should return github_pull_request' do
-        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return('github')
+        allow(highline_cli).to receive(:ask).and_return('github')
         expect(subject).to receive(:github_pull_request)
         subject.send(:ask_for_clarification)
       end
 
       it 'should return github_pull_request' do
-        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return('Github')
+        allow(highline_cli).to receive(:ask).and_return('Github')
         expect(subject).to receive(:github_pull_request)
         subject.send(:ask_for_clarification)
       end
@@ -118,13 +121,13 @@ describe GitHelper::CodeRequest do
 
     context 'when response is gitlab' do
       it 'should return gitlab_merge_request' do
-        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return('gitlab')
+        allow(highline_cli).to receive(:ask).and_return('gitlab')
         expect(subject).to receive(:gitlab_merge_request)
         subject.send(:ask_for_clarification)
       end
 
       it 'should return gitlab_merge_request' do
-        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return('Gitlab')
+        allow(highline_cli).to receive(:ask).and_return('Gitlab')
         expect(subject).to receive(:gitlab_merge_request)
         subject.send(:ask_for_clarification)
       end
@@ -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(:ask).and_return(Faker::Lorem.word)
         expect(subject).to receive(:exit)
         subject.send(:ask_for_clarification)
       end
@@ -170,31 +173,31 @@ describe GitHelper::CodeRequest do
   describe '#base_branch' do
     it 'should call the default branch' do
       expect(subject).to receive(:default_branch)
-      allow(highline_cli).to receive(:base_branch_default?).at_least(:once)
-      allow(highline_cli).to receive(:base_branch).at_least(:once).and_return('base')
+      allow(highline_cli).to receive(:ask_yes_no).at_least(:once)
+      allow(highline_cli).to receive(:ask).at_least(:once).and_return(base_branch)
       subject.send(:base_branch)
     end
 
     it 'should ask the CLI to ask the user' do
       allow(subject).to receive(:default_branch)
-      expect(highline_cli).to receive(:base_branch_default?).at_least(:once)
-      allow(highline_cli).to receive(:base_branch).at_least(:once).and_return('base')
+      expect(highline_cli).to receive(:ask_yes_no).at_least(:once)
+      allow(highline_cli).to receive(:ask).at_least(:once).and_return(base_branch)
       subject.send(:base_branch)
     end
 
     context 'if the user says no' do
-      it "definitely asks for the 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(:ask_yes_no).at_least(:once).and_return(false)
+        expect(highline_cli).to receive(:ask).at_least(:once).and_return(base_branch)
         subject.send(:base_branch)
       end
     end
 
     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).to receive(:ask_yes_no).at_least(:once).and_return(true)
         expect(highline_cli).not_to receive(:base_branch)
         subject.send(:base_branch)
       end
@@ -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
@@ -212,32 +215,32 @@ describe GitHelper::CodeRequest do
   describe '#new_code_request_title' do
     it 'should call autogenerated title method' do
       expect(subject).to receive(:autogenerated_title)
-      allow(highline_cli).to receive(:accept_autogenerated_title?).at_least(:once)
-      allow(highline_cli).to receive(:title).at_least(:once).and_return('Title')
+      allow(highline_cli).to receive(:ask_yes_no).at_least(:once)
+      allow(highline_cli).to receive(:ask).at_least(:once).and_return(title)
       subject.send(:new_code_request_title)
     end
 
     it 'should ask the CLI to ask the user' do
-      allow(subject).to receive(:autogenerated_title)
-      expect(highline_cli).to receive(:accept_autogenerated_title?).at_least(:once)
-      allow(highline_cli).to receive(:title).at_least(:once).and_return('Title')
+      allow(subject).to receive(:autogenerated_title).and_return(Faker::Lorem.sentence)
+      expect(highline_cli).to receive(:ask_yes_no).at_least(:once)
+      allow(highline_cli).to receive(:ask).at_least(:once).and_return(title)
       subject.send(:new_code_request_title)
     end
 
     context 'if the user says no' do
-      it "definitely asks for the user's 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')
+      it 'definitely asks for the users title' do
+        allow(subject).to receive(:autogenerated_title).and_return(Faker::Lorem.sentence)
+        expect(highline_cli).to receive(:ask_yes_no).at_least(:once).and_return(false)
+        expect(highline_cli).to receive(:ask).at_least(:once).and_return(title)
         subject.send(:new_code_request_title)
       end
     end
 
     context 'if the user says yes to original title' do
-      it "does not ask for the user's 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)
+      it 'does not ask for the users chosen title' do
+        allow(subject).to receive(:autogenerated_title).and_return(Faker::Lorem.sentence)
+        expect(highline_cli).to receive(:ask_yes_no).at_least(:once).and_return(true)
+        expect(highline_cli).not_to receive(:ask)
         subject.send(:new_code_request_title)
       end
     end

data/spec/git_helper/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

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