git_helper 3.2.0 → 3.3.2

data/spec/git_helper/empty_commit_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 

data/spec/git_helper/forget_local_commits_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 

data/spec/git_helper/git_config_reader_spec.rb

@@ -1,18 +1,22 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 
 describe GitHelper::GitConfigReader do
+  let(:github_user) { Faker::Internet.username }
   let(:github_token) { Faker::Internet.password(max_length: 10) }
+  let(:gitlab_user) { Faker::Internet.username }
   let(:gitlab_token) { Faker::Internet.password(max_length: 10) }
 
-  let(:config_file) {
+  let(:config_file) do
     {
-      github_user: Faker::Internet.username,
+      github_user: github_user,
       github_token: github_token,
-      gitlab_user: Faker::Internet.username,
+      gitlab_user: gitlab_user,
       gitlab_token: gitlab_token
     }
-  }
+  end
 
   subject { GitHelper::GitConfigReader.new }
 
@@ -40,6 +44,30 @@ describe GitHelper::GitConfigReader do
     end
   end
 
+  describe '#github_user' do
+    it 'should locate the github_user' do
+      expect(subject).to receive(:config_file).and_return(config_file)
+      expect(subject.github_user).to eq(github_user)
+    end
+
+    it 'should call the config file' do
+      expect(subject).to receive(:config_file).and_return(config_file)
+      subject.github_user
+    end
+  end
+
+  describe '#gitlab_user' do
+    it 'should locate the gitlab_user' do
+      expect(subject).to receive(:config_file).and_return(config_file)
+      expect(subject.gitlab_user).to eq(gitlab_user)
+    end
+
+    it 'should call the config file' do
+      expect(subject).to receive(:config_file).and_return(config_file)
+      subject.gitlab_user
+    end
+  end
+
   describe '#config_file' do
     it 'should yaml load the file path' do
       expect(YAML).to receive(:load_file)

data/spec/git_helper/gitlab_client_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 

data/spec/git_helper/highline_cli_spec.rb

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

data/spec/git_helper/local_code_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 

data/spec/git_helper/merge_request_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 
@@ -10,10 +12,9 @@ describe GitHelper::GitLabMergeRequest do
 
   let(:merge_request) do
     double(:merge_request,
-      diff_refs: diff_refs,
-      web_url: Faker::Internet.url,
-      merge_commit_sha: Faker::Internet.password
-    )
+           diff_refs: diff_refs,
+           web_url: Faker::Internet.url,
+           merge_commit_sha: Faker::Internet.password)
   end
 
   let(:options) do
@@ -38,7 +39,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).and_return(merge_request)
-      subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})
+      subject.create({ base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word })
     end
 
     it 'should call various other methods' do
@@ -46,7 +47,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).and_return(merge_request)
-      subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})
+      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
@@ -54,7 +55,7 @@ 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: Faker::Lorem.word, new_title: Faker::Lorem.word})).to eq(nil)
+      expect(subject.create({ base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word })).to eq(nil)
     end
   end
 
@@ -120,19 +121,19 @@ describe GitHelper::GitLabMergeRequest do
 
       it 'should call the CLI to ask about a single template' do
         allow(subject).to receive(:mr_template_options).and_return([template])
-        expect(highline_cli).to receive(:apply_template?).and_return(true)
+        expect(highline_cli).to receive(:ask_yes_no).and_return(true)
         subject.send(:template_name_to_apply)
       end
 
       it 'should return the single template if the user says yes' do
         allow(subject).to receive(:mr_template_options).and_return([template])
-        allow(highline_cli).to receive(:apply_template?).and_return(true)
+        allow(highline_cli).to receive(:ask_yes_no).and_return(true)
         expect(subject.send(:template_name_to_apply)).to eq(template)
       end
 
       it 'should return nil if the user says no' do
         allow(subject).to receive(:mr_template_options).and_return([template])
-        allow(highline_cli).to receive(:apply_template?).and_return(false)
+        allow(highline_cli).to receive(:ask_yes_no).and_return(false)
         expect(subject.send(:template_name_to_apply)).to eq(nil)
       end
     end
@@ -143,19 +144,19 @@ describe GitHelper::GitLabMergeRequest do
 
       it 'should call the CLI to ask which of multiple templates to apply' do
         allow(subject).to receive(:mr_template_options).and_return([template1, template2])
-        expect(highline_cli).to receive(:template_to_apply).and_return(template1)
+        expect(highline_cli).to receive(:ask_options).and_return(template1)
         subject.send(:template_name_to_apply)
       end
 
       it 'should return the answer template if the user says yes' do
         allow(subject).to receive(:mr_template_options).and_return([template1, template2])
-        allow(highline_cli).to receive(:template_to_apply).and_return(template1)
+        allow(highline_cli).to receive(:ask_options).and_return(template1)
         expect(subject.send(:template_name_to_apply)).to eq(template1)
       end
 
       it 'should return nil if the user says no' do
         allow(subject).to receive(:mr_template_options).and_return([template1, template2])
-        allow(highline_cli).to receive(:template_to_apply).and_return('None')
+        allow(highline_cli).to receive(:ask_options).and_return('None')
         expect(subject.send(:template_name_to_apply)).to eq(nil)
       end
     end
@@ -170,25 +171,25 @@ describe GitHelper::GitLabMergeRequest do
 
   describe '#mr_id' do
     it 'should ask the CLI for the code request ID' do
-      expect(highline_cli).to receive(:code_request_id).and_return(Faker::Number.number)
+      expect(highline_cli).to receive(:ask).and_return(Faker::Number.number)
       subject.send(:mr_id)
     end
 
     it 'should equal an integer' do
       pr_id = Faker::Number.number
-      expect(highline_cli).to receive(:code_request_id).and_return(pr_id)
+      expect(highline_cli).to receive(:ask).and_return(pr_id)
       expect(subject.send(:mr_id)).to eq(pr_id)
     end
   end
 
   describe '#squash_merge_request' do
     it 'should ask the CLI for the code request ID' do
-      expect(highline_cli).to receive(:squash_merge_request?).and_return(true)
+      expect(highline_cli).to receive(:ask_yes_no).and_return(true)
       subject.send(:squash_merge_request)
     end
 
     it 'should be a boolean' do
-      expect(highline_cli).to receive(:squash_merge_request?).and_return(false)
+      expect(highline_cli).to receive(:ask_yes_no).and_return(false)
       expect([true, false]).to include(subject.send(:squash_merge_request))
     end
   end
@@ -200,12 +201,12 @@ describe GitHelper::GitLabMergeRequest do
 
     context 'when the existing project has no setting' do
       it 'should ask the CLI for the code request ID' do
-        expect(highline_cli).to receive(:remove_source_branch?).and_return(true)
+        expect(highline_cli).to receive(:ask_yes_no).and_return(true)
         subject.send(:remove_source_branch)
       end
 
       it 'should be a boolean' do
-        allow(highline_cli).to receive(:remove_source_branch?).and_return(false)
+        allow(highline_cli).to receive(:ask_yes_no).and_return(false)
         expect([true, false]).to include(subject.send(:remove_source_branch))
       end
     end
@@ -222,7 +223,7 @@ describe GitHelper::GitLabMergeRequest do
 
     it 'should return the existing projects setting if it exists' do
       allow(subject).to receive(:existing_project).and_return(double(remove_source_branch_after_merge: false))
-      allow(highline_cli).to receive(:remove_source_branch?).and_return(true)
+      allow(highline_cli).to receive(:ask_yes_no).and_return(true)
       expect(subject.send(:remove_source_branch)).to eq(true)
     end
   end
@@ -236,7 +237,7 @@ describe GitHelper::GitLabMergeRequest do
 
   describe '#existing_mr' do
     it 'should call the gitlab client' do
-      allow(highline_cli).to receive(:code_request_id).and_return(Faker::Number.number)
+      allow(highline_cli).to receive(:ask).and_return(Faker::Number.number)
       expect(gitlab_client_client).to receive(:merge_request).and_return(:merge_request)
       subject.send(:existing_mr)
     end