git_reflow 0.7.5 → 0.8.0

data/spec/lib/git_server/pull_request_spec.rb

@@ -5,6 +5,10 @@ describe GitReflow::GitServer::PullRequest do
   let(:github)      { stub_github_with({ user: 'reenhanced', repo: 'repo', pull: pull_request }) }
   let!(:github_api) { github.connection }
   let(:git_server)  { GitReflow::GitServer::GitHub.new {} }
+  let(:user)             { 'reenhanced' }
+  let(:password)         { 'shazam' }
+  let(:enterprise_site)  { 'https://github.reenhanced.com' }
+  let(:enterprise_api)   { 'https://github.reenhanced.com' }
 
   describe "#good_to_merge?(options)" do
     subject            { GitReflow::GitServer::GitHub::PullRequest.new(pull_request) }
@@ -20,11 +24,11 @@ describe GitReflow::GitServer::PullRequest do
         })
       # setup initial valid state
       allow_any_instance_of(GitReflow::GitServer::GitHub::PullRequest).to receive(:build).and_return(Struct.new(:state, :description, :url).new)
-      GitReflow.git_server.stub(:find_open_pull_request).with({from: 'new-feature', to: 'master'}).and_return(pull_request)
+      allow(GitReflow.git_server).to receive(:find_open_pull_request).with({from: 'new-feature', to: 'master'}).and_return(pull_request)
       
       # stubs approvals and last_comment conditions to default to true
-      pull_request.stub(:approvals).and_return(["Simon", "John"])
-      pull_request.stub_chain(:last_comment, :match).and_return(true)
+      allow(pull_request).to receive(:approvals).and_return(["Simon", "John"])
+      allow(pull_request).to receive_message_chain(:last_comment, :match).and_return(true)
       allow(GitReflow::GitServer::PullRequest).to receive(:minimum_approvals).and_return("2")
       allow(GitReflow::GitServer::PullRequest).to receive(:approval_regex).and_return(/(?i-mx:lgtm|looks good to me|:\+1:|:thumbsup:|:shipit:)/)
 
@@ -250,7 +254,7 @@ describe GitReflow::GitServer::PullRequest do
         allow(subject).to receive(:build_status).and_return('failure')
       end
 
-      specify { subject.rejection_message.should eq(": ") }
+      specify { expect(subject.rejection_message).to eq(": ") }
     end
 
     context "Testing Minimum Approvals Failure" do
@@ -259,7 +263,7 @@ describe GitReflow::GitServer::PullRequest do
         allow(subject).to receive(:approval_minimums_reached?).and_return(false)
         allow(GitReflow::GitServer::PullRequest).to receive(:minimum_approvals).and_return("2")
       end
-      specify { subject.rejection_message.should eq("You need approval from at least 2 users!") }
+      specify { expect(subject.rejection_message).to eq("You need approval from at least 2 users!") }
     end
 
     context "Testing Minimum Approvals Reached" do
@@ -268,7 +272,7 @@ describe GitReflow::GitServer::PullRequest do
         allow(subject).to receive(:all_comments_addressed?).and_return(false)
         allow(subject).to receive(:last_comment).and_return("Hello")
       end
-      specify { subject.rejection_message.should eq("The last comment is holding up approval:\nHello") }
+      specify { expect(subject.rejection_message).to eq("The last comment is holding up approval:\nHello") }
     end
 
     context "Testing All Comments Addressed" do
@@ -277,7 +281,7 @@ describe GitReflow::GitServer::PullRequest do
         allow(subject).to receive(:all_comments_addressed?).and_return(false)
         allow(subject).to receive(:last_comment).and_return("Hello")
       end
-      specify { subject.rejection_message.should eq("The last comment is holding up approval:\nHello") }
+      specify { expect(subject.rejection_message).to eq("The last comment is holding up approval:\nHello") }
     end
 
     context "Testing All Comments Addressed" do
@@ -287,7 +291,7 @@ describe GitReflow::GitServer::PullRequest do
         allow(subject).to receive(:all_comments_addressed?).and_return(true)
         allow(subject).to receive(:approval_minimums_reached?).and_return(true)
       end
-      specify { subject.rejection_message.should eq( "You still need a LGTM from: Simon") }
+      specify { expect(subject.rejection_message).to eq( "You still need a LGTM from: Simon") }
     end
 
     context "Testing Last Case" do
@@ -297,7 +301,7 @@ describe GitReflow::GitServer::PullRequest do
         allow(subject).to receive(:all_comments_addressed?).and_return(true)
         allow(subject).to receive(:approval_minimums_reached?).and_return(true)
       end
-      specify { subject.rejection_message.should eq("Your code has not been reviewed yet.") }
+      specify { expect(subject.rejection_message).to eq("Your code has not been reviewed yet.") }
     end
   end
 
@@ -313,7 +317,7 @@ describe GitReflow::GitServer::PullRequest do
         allow(subject).to receive(:minimum_approvals).and_return('2')
         allow(subject).to receive(:approvals).and_return(['Simon'])
       end
-      specify { subject.approval_minimums_reached?.should eq(true) }
+      specify { expect(subject.approval_minimums_reached?).to eq(true) }
     end
 
     context "Testing a Success Case" do
@@ -321,7 +325,7 @@ describe GitReflow::GitServer::PullRequest do
         allow(subject).to receive(:minimum_approvals).and_return('2')
         allow(subject).to receive(:approvals).and_return(['Simon', 'John'])
       end
-      specify { subject.approval_minimums_reached?.should eq(true) }
+      specify { expect(subject.approval_minimums_reached?).to eq(true) }
     end
 
     context "Testing Case with no minimum_approval" do
@@ -329,7 +333,7 @@ describe GitReflow::GitServer::PullRequest do
         allow(subject).to receive(:minimum_approvals).and_return('')
         allow(subject).to receive(:approvals).and_return([])
       end
-      specify { subject.approval_minimums_reached?.should eq(true) }
+      specify { expect(subject.approval_minimums_reached?).to eq(true) }
     end
   end
 
@@ -347,11 +351,11 @@ describe GitReflow::GitServer::PullRequest do
             comments: [{author: 'tito', body: 'lgtm'}, {author: 'ringo', body: ':+1:'}]
           })
         allow_any_instance_of(GitReflow::GitServer::GitHub::PullRequest).to receive(:build).and_return(Struct.new(:state, :description, :url).new)
-        GitReflow.git_server.stub(:find_open_pull_request).with({from: 'new-external-feature', to: 'master'}).and_return(pull_request)
+        allow(GitReflow.git_server).to receive(:find_open_pull_request).with({from: 'new-external-feature', to: 'master'}).and_return(pull_request)
       end
 
       it "displays relavent information about the pull request" do
-        expect{ subject }.to have_output("branches: new-external-feature -> reenhanced:master")
+        expect{ subject }.to have_output("branches: new-external-feature -> master")
         expect{ subject }.to have_output("number: #{pull_request.number}")
         expect{ subject }.to have_output("url: #{pull_request.html_url}")
         expect{ subject }.to have_output("reviewed by: #{"tito".colorize(:green)}, #{"ringo".colorize(:green)}")
@@ -377,11 +381,11 @@ describe GitReflow::GitServer::PullRequest do
             ]
           })
         allow_any_instance_of(GitReflow::GitServer::GitHub::PullRequest).to receive(:build).and_return(Struct.new(:state, :description, :url).new)
-        GitReflow.git_server.stub(:find_open_pull_request).with({from: 'new-external-feature', to: 'master'}).and_return(pull_request)
+        allow(GitReflow.git_server).to receive(:find_open_pull_request).with({from: 'new-external-feature', to: 'master'}).and_return(pull_request)
       end
 
       it "displays relavent information about the pull request" do
-        expect{ subject }.to have_output("branches: new-external-feature -> reenhanced:master")
+        expect{ subject }.to have_output("branches: new-external-feature -> master")
         expect{ subject }.to have_output("number: #{pull_request.number}")
         expect{ subject }.to have_output("url: #{pull_request.html_url}")
         expect{ subject }.to have_output("reviewed by: #{"tito".colorize(:green)}, #{"ringo".colorize(:green)}, #{"Simon".colorize(:green)}, #{"Peter".colorize(:green)}, #{"Johnny".colorize(:green)}, #{"Jacob".colorize(:green)}")
@@ -389,4 +393,191 @@ describe GitReflow::GitServer::PullRequest do
       end
     end
   end
+
+  context ".merge!" do
+    subject            { GitReflow::GitServer::GitHub::PullRequest.new(pull_request) }
+
+    let(:inputs) {
+      { 
+        :base => "base_branch",
+        :title => "title",
+        :message => "message"
+      }
+    }
+
+    let(:lgtm_comment_authors) {
+      ["simonzhu24", "reenhanced"]
+    }
+
+    let(:merge_response) { { :message => "Failure_Message" } }
+
+    context "finds pull request but merge response fails" do
+      before do
+        allow(GitReflow).to receive(:git_server).and_return(git_server)
+        allow(git_server).to receive(:connection).and_return(github)
+        allow(git_server).to receive(:get_build_status).and_return(Struct.new(:state, :description, :target_url).new())
+        allow(GitReflow::GitServer::GitHub).to receive_message_chain(:connection, :pull_requests, :merge).and_return(merge_response)
+        allow(merge_response).to receive(:success?).and_return(false)
+        allow_any_instance_of(GitReflow::GitServer::GitHub::PullRequest).to receive(:approvals).and_return(lgtm_comment_authors)
+        allow(subject).to receive(:deliver?).and_return(true)
+        allow(merge_response).to receive(:to_s).and_return("Merge failed")
+      end
+
+      it "throws an error" do
+        expect { subject.merge! inputs }.to have_said "Merge failed", :deliver_halted
+        expect { subject.merge! inputs }.to have_said "There were problems commiting your feature... please check the errors above and try again.", :error
+      end
+    end
+  end
+
+  context ".commit_message_for_merge" do
+    subject            { GitReflow::GitServer::GitHub::PullRequest.new(pull_request) }
+
+    let(:lgtm_comment_authors) {
+      ["simonzhu24", "reenhanced"]
+    }
+
+    let(:output) { lgtm_comment_authors.join(', @') }
+
+    context "checks commit message generated is correct" do
+      before do
+        allow_any_instance_of(GitReflow::GitServer::GitHub::PullRequest).to receive(:build).and_return(Struct.new(:state, :description, :url).new)
+        allow_any_instance_of(GitReflow::GitServer::GitHub::PullRequest).to receive(:description).and_return("Description")
+        allow_any_instance_of(GitReflow::GitServer::GitHub::PullRequest).to receive(:number).and_return(1)
+        allow_any_instance_of(GitReflow::GitServer::GitHub::PullRequest).to receive(:approvals).and_return(lgtm_comment_authors)
+      end
+
+      it "throws an exception without message" do
+        expect(subject.commit_message_for_merge).to eq("Description\nMerges #1\n\nLGTM given by: @simonzhu24, @reenhanced\n\n")
+      end
+    end
+  end
+
+  context :cleanup_feature_branch? do
+    subject { GitReflow::GitServer::GitHub::PullRequest.new(pull_request).cleanup_feature_branch? }
+
+    before do
+      allow(GitReflow::Config).to receive(:get).with("reflow.always-cleanup").and_return("false")
+      allow_any_instance_of(GitReflow::GitServer::GitHub::PullRequest).to receive(:build).and_return(Struct.new(:state, :description, :url).new)
+      FakeGitHub.new(
+        repo_owner:   'reenhanced',
+        repo_name:    'repo',
+        pull_request: {
+          number:   pull_request.number,
+          owner:    pull_request.head.user.login,
+          comments: [{author: 'tito', body: 'lgtm'}, {author: 'ringo', body: ':+1:'}]
+        })
+    end
+
+    context "doesn't cleanup feature branch" do
+      before do
+        allow_any_instance_of(HighLine).to receive(:ask) do |terminal, question|
+          values = {
+            "Please enter your GitHub username: "                                                      => user,
+            "Please enter your GitHub password (we do NOT store this): "                               => password,
+            "Please enter your Enterprise site URL (e.g. https://github.company.com):"                 => enterprise_site,
+            "Please enter your Enterprise API endpoint (e.g. https://github.company.com/api/v3):"      => enterprise_api,
+            "Would you like to push this branch to your remote repo and cleanup your feature branch? " => 'no',
+            "Would you like to open it in your browser?"                                               => 'n',
+            "This is the current status of your Pull Request. Are you sure you want to deliver? "      => 'n', 
+            "Please enter your delivery commit title: (leaving blank will use default)"                => 'title',
+            "Please enter your delivery commit message: (leaving blank will use default)"              => 'message'
+          }
+         return_value = values[question] || values[terminal]
+         question = ""
+         return_value
+        end
+      end
+
+      it "doesn't cleans up feature branch" do
+        expect(subject).to be_falsy
+      end
+    end
+
+    context "does cleanup feature branch" do
+      before do
+        stub_command_line_inputs({
+            "Please enter your GitHub username: "                                                      => user,
+            "Please enter your GitHub password (we do NOT store this): "                               => password,
+            "Please enter your Enterprise site URL (e.g. https://github.company.com):"                 => enterprise_site,
+            "Please enter your Enterprise API endpoint (e.g. https://github.company.com/api/v3):"      => enterprise_api,
+            "Would you like to push this branch to your remote repo and cleanup your feature branch? " => 'yes',
+            "This is the current status of your Pull Request. Are you sure you want to deliver? "      => 'n', 
+            "Please enter your delivery commit title: (leaving blank will use default)"                => 'title',
+            "Please enter your delivery commit message: (leaving blank will use default)"              => 'message'
+        })
+      end
+
+      it "cleans up feature branch" do
+        expect(subject).to be_truthy
+      end
+    end
+  end
+
+  context :deliver? do
+    subject { GitReflow::GitServer::GitHub::PullRequest.new(pull_request).deliver? }
+
+    before do
+      allow(GitReflow::Config).to receive(:get).with("reflow.always-deliver").and_return("false")
+      allow_any_instance_of(GitReflow::GitServer::GitHub::PullRequest).to receive(:build).and_return(Struct.new(:state, :description, :url).new)
+      FakeGitHub.new(
+        repo_owner:   'reenhanced',
+        repo_name:    'repo',
+        pull_request: {
+          number:   pull_request.number,
+          owner:    pull_request.head.user.login,
+          comments: [{author: 'tito', body: 'lgtm'}, {author: 'ringo', body: ':+1:'}]
+        })
+    end
+
+    context "doesn't deliver feature branch" do
+      before do
+        allow_any_instance_of(HighLine).to receive(:ask) do |terminal, question|
+          values = {
+            "Please enter your GitHub username: "                                                      => user,
+            "Please enter your GitHub password (we do NOT store this): "                               => password,
+            "Please enter your Enterprise site URL (e.g. https://github.company.com):"                 => enterprise_site,
+            "Please enter your Enterprise API endpoint (e.g. https://github.company.com/api/v3):"      => enterprise_api,
+            "Would you like to push this branch to your remote repo and cleanup your feature branch? " => 'no',
+            "Would you like to open it in your browser?"                                               => 'n',
+            "This is the current status of your Pull Request. Are you sure you want to deliver? "      => 'n', 
+            "Please enter your delivery commit title: (leaving blank will use default)"                => 'title',
+            "Please enter your delivery commit message: (leaving blank will use default)"              => 'message'
+          }
+         return_value = values[question] || values[terminal]
+         question = ""
+         return_value
+        end
+      end
+
+      it "doesn't deliver feature branch" do
+        expect(subject).to be_falsy
+      end
+    end
+
+    context "does deliver feature branch" do
+      before do
+        allow_any_instance_of(HighLine).to receive(:ask) do |terminal, question|
+          values = {
+            "Please enter your GitHub username: "                                                      => user,
+            "Please enter your GitHub password (we do NOT store this): "                               => password,
+            "Please enter your Enterprise site URL (e.g. https://github.company.com):"                 => enterprise_site,
+            "Please enter your Enterprise API endpoint (e.g. https://github.company.com/api/v3):"      => enterprise_api,
+            "Would you like to push this branch to your remote repo and cleanup your feature branch? " => 'no',
+            "Would you like to open it in your browser?"                                               => 'n',
+            "This is the current status of your Pull Request. Are you sure you want to deliver? "      => 'y', 
+            "Please enter your delivery commit title: (leaving blank will use default)"                => 'title',
+            "Please enter your delivery commit message: (leaving blank will use default)"              => 'message'
+          }
+         return_value = values[question] || values[terminal]
+         question = ""
+         return_value
+        end
+      end
+
+      it "does deliver feature branch" do
+        expect(subject).to be_truthy
+      end
+    end
+  end
 end

data/spec/support/command_line_helpers.rb

@@ -8,10 +8,8 @@ module CommandLineHelpers
     stub_run_for GitReflow
     stub_run_for GitReflow::Sandbox
 
-    STDOUT.stub(:puts) do |output|
-      $output << output
-      output = ''
-    end
+    stub_output_for(GitReflow)
+    stub_output_for(GitReflow::Sandbox)
 
     allow_any_instance_of(GitReflow::GitServer::PullRequest).to receive(:printf) do |format, *output|
       $output << Array(output).join(" ")
@@ -19,15 +17,22 @@ module CommandLineHelpers
     end.and_return("")
   end
 
+  def stub_output_for(object_to_stub, method_to_stub = :puts)
+    allow_any_instance_of(object_to_stub).to receive(method_to_stub) do |output|
+      $output << output
+      output = ''
+    end
+  end
+
   def stub_run_for(module_to_stub)
-    module_to_stub.stub(:run) do |command, options|
+    allow(module_to_stub).to receive(:run) do |command, options|
       options ||= {}
       $commands_ran << Hashie::Mash.new(command: command, options: options)
       ret_value = $stubbed_commands[command] || ""
       command = "" # we need this due to a bug in rspec that will keep this assignment on subsequent runs of the stub
       ret_value
     end
-    module_to_stub.stub(:say) do |output, type|
+    allow(module_to_stub).to receive(:say) do |output, type|
       $says << {message: output, type: type}
     end
   end
@@ -41,11 +46,11 @@ module CommandLineHelpers
 
   def stub_command(command, return_value)
     $stubbed_commands[command] = return_value
-    GitReflow::Sandbox.stub(:run).with(command).and_return(return_value)
+    allow(GitReflow::Sandbox).to receive(:run).with(command).and_return(return_value)
   end
 
   def stub_command_line_inputs(inputs)
-    HighLine.any_instance.stub(:ask) do |terminal, question|
+    allow_any_instance_of(HighLine).to receive(:ask) do |terminal, question|
      return_value = inputs[question]
      question = ""
      return_value
@@ -93,7 +98,7 @@ RSpec::Matchers.define :have_run_commands_in_order do |commands|
       next unless command_start_index
       if command_count >= 1
         current_command = commands[command_count - 1]
-        current_command.should == command_ran.command
+        expect(current_command).to eq(command_ran.command)
         command_count -= 1
       end
     end

data/spec/support/github_helpers.rb

@@ -16,7 +16,7 @@ module GithubHelpers
     branch           = options[:branch] || 'new-feature'
     pull             = options[:pull]
 
-    HighLine.any_instance.stub(:ask) do |terminal, question|
+    allow_any_instance_of(HighLine).to receive(:ask) do |terminal, question|
       values = {
         "Please enter your GitHub username: "                                                 => user,
         "Please enter your GitHub password (we do NOT store this): "                          => password,
@@ -37,27 +37,27 @@ module GithubHelpers
     end
 
     stub_request(:get, "#{api_endpoint}/authorizations?").to_return(:body => [oauth_token_hash].to_json, status: 200, headers: {})
-    Github.stub(:new).and_return(github)
-    GitReflow.stub(:push_current_branch).and_return(true)
-    GitReflow.stub(:github).and_return(github)
-    GitReflow.stub(:current_branch).and_return(branch)
-    GitReflow.stub(:remote_repo_name).and_return(repo)
-    GitReflow.stub(:remote_user).and_return(user)
-    GitReflow.stub(:fetch_destination).and_return(true)
-    GitReflow.stub(:update_destination).and_return(true)
+    allow(Github::Client).to receive(:new).and_return(github)
+    allow(GitReflow).to receive(:push_current_branch).and_return(true)
+    allow(GitReflow).to receive(:github).and_return(github)
+    allow(GitReflow).to receive(:current_branch).and_return(branch)
+    allow(GitReflow).to receive(:remote_repo_name).and_return(repo)
+    allow(GitReflow).to receive(:remote_user).and_return(user)
+    allow(GitReflow).to receive(:fetch_destination).and_return(true)
+    allow(GitReflow).to receive(:update_destination).and_return(true)
 
-    GitReflow::GitServer::GitHub.any_instance.stub(:run).with('hostname', loud: false).and_return(hostname)
+    allow_any_instance_of(GitReflow::GitServer::GitHub).to receive(:run).with('hostname', loud: false).and_return(hostname)
     github_server = GitReflow::GitServer::GitHub.new
-    github_server.class.stub(:user).and_return(user)
-    github_server.class.stub(:oauth_token).and_return(oauth_token_hash.token)
-    github_server.class.stub(:site_url).and_return(site_url)
-    github_server.class.stub(:api_endpoint).and_return(api_endpoint)
-    github_server.class.stub(:remote_user).and_return(user)
-    github_server.class.stub(:remote_repo).and_return(repo)
-    github_server.class.stub(:oauth_token).and_return(oauth_token_hash.token)
-    github_server.class.stub(:get_committed_time).and_return(Time.now)
+    allow(github_server.class).to receive(:user).and_return(user)
+    allow(github_server.class).to receive(:oauth_token).and_return(oauth_token_hash.token)
+    allow(github_server.class).to receive(:site_url).and_return(site_url)
+    allow(github_server.class).to receive(:api_endpoint).and_return(api_endpoint)
+    allow(github_server.class).to receive(:remote_user).and_return(user)
+    allow(github_server.class).to receive(:remote_repo).and_return(repo)
+    allow(github_server.class).to receive(:oauth_token).and_return(oauth_token_hash.token)
+    allow(github_server.class).to receive(:get_committed_time).and_return(Time.now)
 
-    GitReflow.stub(:git_server).and_return(github_server)
+    allow(GitReflow).to receive(:git_server).and_return(github_server)
 
     # Stubbing statuses for a given commit
     #stub_request(:get, %r{#{GitReflow.git_server.class.api_endpoint}/repos/#{user}/commits/\w+}).
@@ -79,9 +79,9 @@ module GithubHelpers
         to_return(:body => Fixture.new('pull_requests/pull_requests.json').to_s, :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
       # Stubbing pull request comments
       stub_get("/repos/#{user}/#{repo}/pulls/#{pull.number}/comments?").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0'}).
-        to_return(:body => Fixture.new('pull_requests/comments.json.erb', repo_owner: user, repo_name: repo, comments: [{author: user}], pull_request_number: pull.number).to_json.to_s, :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+        to_return(:body => Fixture.new('pull_requests/comments.json.erb', repo_owner: user, repo_name: repo, comments: [{author: user}], pull_request_number: pull.number).to_json.to_s, :status => 201, :headers => {'Accept' => 'application/vnd.github.v3+json,application/vnd.github.beta+json;q=0.5,application/json;q=0.1', :content_type => "application/json; charset=utf-8"})
       stub_get("/repos/#{user}/pulls/#{pull.number}/comments?").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0'}).
-        to_return(:body => Fixture.new('pull_requests/comments.json.erb', repo_owner: user, repo_name: repo, comments: [{author: user}], pull_request_number: pull.number).to_s, :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+        to_return(:body => Fixture.new('pull_requests/comments.json.erb', repo_owner: user, repo_name: repo, comments: [{author: user}], pull_request_number: pull.number).to_s, :status => 201, :headers => {'Accept' => 'application/vnd.github.v3+json,application/vnd.github.beta+json;q=0.5,application/json;q=0.1', :content_type => "application/json; charset=utf-8"})
       # Stubbing issue comments
       stub_get("/repos/#{user}/issues/#{pull.number}/comments?").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0'}).
         to_return(:body => Fixture.new('issues/comments.json.erb', repo_owner: user, repo_name: repo, comments: [{author: user}], pull_request_number: pull.number).to_s, :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})

data/spec/support/rspec_stub_helpers.rb

@@ -1,7 +1,7 @@
 module RspecStubHelpers
   def stub_with_fallback(obj, method)
     original_method = obj.method(method)
-    obj.stub(method).with(anything()) { |*args| original_method.call(*args) }
-    return obj.stub(method)
+    allow(obj).to receive(method).with(anything()) { |*args| original_method.call(*args) }
+    return allow(obj).to receive(method)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -130,14 +130,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -158,14 +158,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: 2.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -200,14 +200,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: reenhanced_bitbucket_api
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +247,7 @@ files:
 - lib/git_reflow.rb
 - lib/git_reflow/base.rb
 - lib/git_reflow/commands/deliver.rb
+- lib/git_reflow/commands/refresh.rb
 - lib/git_reflow/commands/review.rb
 - lib/git_reflow/commands/setup.rb
 - lib/git_reflow/commands/stage.rb
@@ -261,6 +262,7 @@ files:
 - lib/git_reflow/git_server/git_hub.rb
 - lib/git_reflow/git_server/git_hub/pull_request.rb
 - lib/git_reflow/git_server/pull_request.rb
+- lib/git_reflow/merge_error.rb
 - lib/git_reflow/os_detector.rb
 - lib/git_reflow/sandbox.rb
 - lib/git_reflow/version.rb