git_helper 3.0.0 → 3.2.0

data/spec/git_helper/new_branch_spec.rb

@@ -11,6 +11,7 @@ describe GitHelper::NewBranch do
   before do
     allow(GitHelper::LocalCode).to receive(:new).and_return(local_code)
     allow(GitHelper::HighlineCli).to receive(:new).and_return(cli)
+    allow(subject).to receive(:puts)
   end
 
   it 'should call GitHelper::LocalCode' do

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
     }
@@ -19,49 +20,50 @@ describe GitHelper::GitHubPullRequest do
 
   before do
     allow(GitHelper::OctokitClient).to receive(:new).and_return(octokit_client)
+    allow(subject).to receive(:puts)
   end
 
   describe '#create' 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'})
+      expect(octokit_client_client).to receive(:create_pull_request).and_return(double(html_url: Faker::Internet.url))
+      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'})
+      allow(octokit_client_client).to receive(:create_pull_request).and_return(double(html_url: Faker::Internet.url))
+      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)
-      expect(octokit_client_client).to receive(:merge_pull_request)
+      allow(subject).to receive(:pr_id).and_return(Faker::Number.number)
+      expect(octokit_client_client).to receive(:merge_pull_request).and_return(double(sha: Faker::Internet.password))
       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)
-      allow(octokit_client_client).to receive(:merge_pull_request)
+      expect(subject).to receive(:pr_id).and_return(Faker::Number.number).at_least(:once)
+      allow(octokit_client_client).to receive(:merge_pull_request).and_return(double(sha: Faker::Internet.password))
       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 +97,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 +151,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 +180,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 +239,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.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Emma Sax
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -72,14 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +146,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -189,23 +202,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A set of GitHub and GitLab workflow scripts.
 test_files:
 - spec/spec_helper.rb
-- spec/git_helper/octokit_client_spec.rb
-- spec/git_helper/new_branch_spec.rb
-- spec/git_helper/forget_local_commits_spec.rb
-- spec/git_helper/clean_branches_spec.rb
 - spec/git_helper/change_remote_spec.rb
 - spec/git_helper/checkout_default_spec.rb
-- spec/git_helper/pull_request_spec.rb
-- spec/git_helper/gitlab_client_spec.rb
+- spec/git_helper/clean_branches_spec.rb
 - spec/git_helper/code_request_spec.rb
 - spec/git_helper/empty_commit_spec.rb
-- spec/git_helper/highline_cli_spec.rb
+- spec/git_helper/forget_local_commits_spec.rb
 - spec/git_helper/git_config_reader_spec.rb
-- spec/git_helper/merge_request_spec.rb
+- spec/git_helper/gitlab_client_spec.rb
+- spec/git_helper/highline_cli_spec.rb
 - spec/git_helper/local_code_spec.rb
+- spec/git_helper/merge_request_spec.rb
+- spec/git_helper/new_branch_spec.rb
+- spec/git_helper/octokit_client_spec.rb
+- spec/git_helper/pull_request_spec.rb

data/Gemfile.lock

@@ -1,101 +0,0 @@
-PATH
-  remote: .
-  specs:
-    git_helper (2.0.2)
-      gitlab (~> 4.16)
-      gli (~> 2.13)
-      highline (~> 2.0)
-      octokit (~> 4.18)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    coderay (1.1.3)
-    diff-lcs (1.4.4)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.13.1)
-    formatador (0.2.5)
-    gitlab (4.16.1)
-      httparty (~> 0.14, >= 0.14.0)
-      terminal-table (~> 1.5, >= 1.5.1)
-    gli (2.19.2)
-    guard (2.16.2)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    highline (2.0.3)
-    httparty (0.18.1)
-      mime-types (~> 3.0)
-      multi_xml (>= 0.5.2)
-    listen (3.2.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.8)
-    method_source (1.0.0)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
-    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)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    public_suffix (4.0.6)
-    rake (13.0.1)
-    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)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    sawyer (0.8.2)
-      addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    shellany (0.0.1)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (1.0.1)
-    unicode-display_width (1.7.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.1)
-  git_helper!
-  guard-rspec (~> 4.3)
-  rake (~> 13.0)
-  rspec (~> 3.9)
-
-BUNDLED WITH
-   2.1.4