git_reflow 0.8.9 → 0.9.3

data/spec/lib/git_reflow/workflows/flat_merge_spec.rb

@@ -1,59 +1,71 @@
-require 'spec_helper'
-
-describe 'FlatMerge' do
-  let(:workflow_path) { File.join(File.expand_path("../../../../../lib/git_reflow/workflows", __FILE__), "/flat_merge.rb") }
-  let(:mergable_pr) { double(good_to_merge?: true, merge!: true) }
-  let(:git_server)  { double(find_open_pull_request: mergable_pr) }
-
-  before  do
-    allow(GitReflow::Config).to receive(:get).and_return('')
-    allow(GitReflow::Config).to receive(:get).with("reflow.workflow").and_return(workflow_path)
-    allow(GitReflow).to receive(:git_server).and_return(git_server)
-    allow(GitReflow).to receive(:status)
-  end
-
-  # Makes sure we are loading the right workflow
-  specify { expect( GitReflow.workflow ).to eql(GitReflow::Workflow::FlatMerge) }
-
-  context ".deliver" do
-    subject { GitReflow.deliver }
-
-    context "with Github" do
-      let(:github_pr)   { Fixture.new('pull_requests/external_pull_request.json').to_json_hashie }
-      let(:pr)          { GitReflow::GitServer::GitHub::PullRequest.new(github_pr) }
-      let(:github)      { stub_github_with }
-      let!(:github_api) { github.connection }
-
-      before do
-        allow_any_instance_of(GitReflow::GitServer::PullRequest).to receive(:deliver?).and_return(false)
-        allow(GitReflow::GitServer::GitHub::PullRequest).to receive(:find_open).and_return(pr)
-        allow(pr).to receive(:good_to_merge?).and_return(true)
-        allow(GitReflow::Workflows::Core).to receive(:status)
-      end
-
-      it "overrides squash merge in favor of flat merge" do
-        expect(pr).to receive(:merge!).with(base: 'master', squash: false)
-        subject
-      end
-    end
-
-    context "when force-merging or with bitbucket" do
-      let(:pr_response) { Fixture.new('pull_requests/external_pull_request.json').to_json_hashie }
-      let(:pr)          { MockPullRequest.new(pr_response) }
-
-      subject { GitReflow.deliver force: true}
-
-      before do
-        allow(GitReflow.git_server).to receive(:find_open_pull_request).and_return(pr)
-        allow(pr).to receive(:good_to_merge?).and_return(true)
-        allow(GitReflow::Workflows::Core).to receive(:status)
-      end
-
-      it "doesn't squash merge" do
-        expect(pr).to receive(:merge!).with(base: 'master', squash: false, force: true, skip_lgtm: true)
-        subject
-      end
-    end
-  end
-
-end
+require 'spec_helper'
+
+describe 'FlatMerge' do
+  let(:mergable_pr) { double(good_to_merge?: true, merge!: true) }
+  let(:git_server)  { double(find_open_pull_request: mergable_pr) }
+
+  before  do
+    allow(GitReflow::Config).to receive(:get).and_call_original
+    allow(GitReflow).to receive(:git_server).and_return(git_server)
+    allow(GitReflow).to receive(:status)
+    # Makes sure we are loading the right workflow
+    workflow_path = File.join(File.expand_path("../../../../../lib/git_reflow/workflows", __FILE__), "FlatMergeWorkflow")
+    use_workflow(workflow_path)
+  end
+
+  after { GitReflow::Workflow.reset! }
+
+  context ".deliver" do
+    subject { GitReflow.deliver }
+
+    context "with Github" do
+      let(:github_pr)   { Fixture.new('pull_requests/external_pull_request.json').to_json_hashie }
+      let(:pr)          { GitReflow::GitServer::GitHub::PullRequest.new(github_pr) }
+      let(:github)      { stub_github_with }
+      let!(:github_api) { github.connection }
+
+      before do
+        allow(File).to receive(:read).and_call_original
+        allow_any_instance_of(GitReflow::GitServer::PullRequest).to receive(:deliver?).and_return(false)
+        allow(GitReflow::Workflows::Core).to receive(:status)
+        allow(GitReflow.git_server).to receive(:get_build_status).and_return(Struct.new(:state, :description, :url, :target_url).new)
+        allow(GitReflow::GitServer::GitHub::PullRequest).to receive(:find_open).and_return(pr)
+        allow(pr).to receive(:good_to_merge?).and_return(true)
+      end
+
+      it "overrides squash merge in favor of flat merge" do
+        expect(pr).to receive(:merge!).with(
+          base: "master",
+          merge_method: "merge",
+          force: false,
+          skip_lgtm: false
+        )
+        subject
+      end
+    end
+
+    context "when force-merging or with bitbucket" do
+      let(:pr_response) { Fixture.new('pull_requests/external_pull_request.json').to_json_hashie }
+      let(:pr)          { MockPullRequest.new(pr_response) }
+
+      subject { GitReflow.deliver force: true}
+
+      before do
+        allow(GitReflow.git_server).to receive(:find_open_pull_request).and_return(pr)
+        allow(pr).to receive(:good_to_merge?).and_return(true)
+        allow(GitReflow::Workflows::Core).to receive(:status)
+      end
+
+      it "doesn't squash merge" do
+        expect(pr).to receive(:merge!).with(
+          base: "master",
+          merge_method: "merge",
+          force: true,
+          skip_lgtm: false
+        )
+        subject
+      end
+    end
+  end
+
+end

data/spec/lib/git_reflow_spec.rb

@@ -17,24 +17,11 @@ describe GitReflow do
     end
   end
 
-  describe ".default_editor" do
-    subject { GitReflow.default_editor }
-
-    context "when the environment has EDITOR set" do
-      before  { allow(ENV).to receive(:[]).with('EDITOR').and_return('emacs') }
-      specify { expect( subject ).to eql('emacs') }
-    end
-
-    context "when the environment has no EDITOR set" do
-      before  { allow(ENV).to receive(:[]).with('EDITOR').and_return(nil) }
-      specify { expect( subject ).to eql('vi') }
-    end
-  end
-
   describe ".git_server" do
     subject { GitReflow.git_server }
 
     before do
+      allow(GitReflow::Config).to receive(:get)
       allow(GitReflow::Config).to receive(:get).with('reflow.git-server').and_return('GitHub ')
     end
 
@@ -52,23 +39,13 @@ describe GitReflow do
     end
 
     context "when a workflow is set" do
-
       it "calls the defined workflow methods instead of the default core" do
         workflow_path = File.join(File.expand_path("../../fixtures", __FILE__), "/awesome_workflow.rb")
         allow(GitReflow::Config).to receive(:get).with("reflow.workflow").and_return(workflow_path)
+        expect(GitReflow::Workflows::Core).to receive(:load_raw_workflow).with(File.read(workflow_path)).and_call_original
 
-        expect(GitReflow.workflow).to eql(GitReflow::Workflow::AwesomeWorkflow)
         expect{ subject.start }.to have_said "Awesome."
       end
-
-      it "the workflow can call super" do
-        workflow_path = File.join(File.expand_path("../../fixtures", __FILE__), "/workflow_with_super.rb")
-        allow(GitReflow::Config).to receive(:get).with("reflow.workflow").and_return(workflow_path)
-
-        expect(GitReflow.workflow).to eql(GitReflow::Workflow::WorkflowWithSuper)
-        expect{ subject.start }.to have_said "Super."
-        expect{ subject.start }.to have_said "usage: git-reflow start [new-branch-name]", :error
-      end
     end
 
   end

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ RSpec.configure do |config|
   config.include GitReflow::RSpec::CommandLineHelpers
   config.include GithubHelpers
   config.include GitReflow::RSpec::StubHelpers
+  config.include GitReflow::RSpec::WorkflowHelpers
 
   config.expect_with :rspec do |c|
     c.syntax = [:should, :expect]
@@ -28,6 +29,8 @@ RSpec.configure do |config|
   config.before(:each) do
     WebMock.reset!
     stub_command_line
+    suppress_loading_of_external_workflows
+    GitReflow::Workflow.reset!
     allow_message_expectations_on_nil
   end
 

data/spec/support/fixtures.rb

@@ -1,54 +1,54 @@
-# ERB parsing credit:
-# http://stackoverflow.com/questions/8954706/render-an-erb-template-with-values-from-a-hash/9734736#9734736
-
-require 'erb'
-require 'ostruct'
-
-class Fixture
-  attr_accessor :file, :locals
-
-  def initialize(file, locals = {})
-    @file   = fixture(file)
-    @locals = locals
-  end
-
-  def fixture_path
-    File.expand_path("../../fixtures", __FILE__)
-  end
-
-  def fixture(file)
-    File.new(File.join(fixture_path, "/", file))
-  end
-
-  def to_s
-    if File.extname(file) == ".erb"
-      ERB.new(template_file_content).result(OpenStruct.new(locals).instance_eval { binding }).to_s
-    else
-      template_file_content.to_s
-    end
-  end
-
-  def to_json
-    if File.extname(file) == ".erb"
-      rendered_file = ERB.new(template_file_content).result(OpenStruct.new(locals).instance_eval { binding })
-      JSON.parse(rendered_file)
-    else
-      JSON.parse(template_file_content)
-    end
-  end
-
-  def to_json_hashie
-    json = self.to_json
-    if json.is_a? Array
-      json.map {|json_object| Hashie::Mash.new json_object }
-    else
-      Hashie::Mash.new json
-    end
-  end
-
-  private
-
-  def template_file_content
-    @file_content ||= file.read
-  end
-end
+# ERB parsing credit:
+# http://stackoverflow.com/questions/8954706/render-an-erb-template-with-values-from-a-hash/9734736#9734736
+
+require 'erb'
+require 'ostruct'
+
+class Fixture
+  attr_reader :file, :locals
+
+  def initialize(file, locals = {})
+    @file   = fixture(file)
+    @locals = locals
+  end
+
+  def fixture_path
+    File.expand_path("../../fixtures", __FILE__)
+  end
+
+  def fixture(file)
+    File.new(File.join(fixture_path, "/", file))
+  end
+
+  def to_s
+    if File.extname(file) == ".erb"
+      ERB.new(template_file_content).result(OpenStruct.new(locals).instance_eval { binding }).to_s
+    else
+      template_file_content.to_s
+    end
+  end
+
+  def to_json
+    if File.extname(file) == ".erb"
+      rendered_file = ERB.new(template_file_content).result(OpenStruct.new(locals).instance_eval { binding })
+      JSON.parse(rendered_file)
+    else
+      JSON.parse(template_file_content)
+    end
+  end
+
+  def to_json_hashie
+    json = self.to_json
+    if json.is_a? Array
+      json.map {|json_object| Hashie::Mash.new json_object }
+    else
+      Hashie::Mash.new json
+    end
+  end
+
+  private
+
+  def template_file_content
+    @file_content ||= file.read
+  end
+end

data/spec/support/github_helpers.rb

@@ -1,109 +1,99 @@
-$LOAD_PATH << 'lib'
-require 'git_reflow'
-require 'github_api'
-require 'spec_helper'
-
-module GithubHelpers
-  def stub_github_with(options = {})
-
-    hostname         = options[:hostname] || 'hostname.local'
-    api_endpoint     = options[:api_endpoint] || "https://api.github.com"
-    site_url         = options[:site_url] || "https://github.com"
-    user             = options[:user] || 'reenhanced'
-    password         = options[:passwordl] || 'shazam'
-    oauth_token_hash = Hashie::Mash.new({ token: 'a1b2c3d4e5f6g7h8i9j0', note: 'git-reflow (hostname.local)'})
-    repo             = options[:repo] || 'repo'
-    branch           = options[:branch] || 'new-feature'
-    pull             = options[:pull]
-
-    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
-      }
-     return_value = values[question] || values[terminal]
-     question = ""
-     return_value
-    end
-
-    github = Github.new do |config|
-      config.oauth_token = oauth_token_hash.token
-      config.endpoint    = api_endpoint
-      config.site        = site_url
-      config.adapter     = :net_http
-      config.ssl         = {:verify => false}
-    end
-
-    stub_request(:get, "#{api_endpoint}/authorizations?").to_return(:body => [oauth_token_hash].to_json, status: 200, headers: {})
-    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)
-
-    allow_any_instance_of(GitReflow::GitServer::GitHub).to receive(:run).with('hostname', loud: false).and_return(hostname)
-    github_server = GitReflow::GitServer::GitHub.new
-    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)
-
-    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+}).
-    #  to_return(:body => Fixture.new('repositories/commit.json.erb', repo_owner: user, repo_name: repo, author: user).to_json.to_s, :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
-    stub_request(:get, %r{/repos/#{user}/(#{repo}/)?commits/\w+/statuses}).
-      to_return(:body => Fixture.new('repositories/statuses.json').to_s, :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
-
-    if pull
-      # Stubbing review
-      stub_post("/repos/#{user}/#{repo}/pulls").
-        to_return(:body => pull.to_s, :status => 201, :headers => {:content_type => "application/json\; charset=utf-8"})
-
-      # Stubbing pull request finder
-      stub_get("/repos/#{user}/#{repo}/pulls/#{pull.number}").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0'}).
-        to_return(:body => Fixture.new('pull_requests/pull_request.json').to_s, :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/repos/#{user}/pulls").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0', 'base' => 'master', 'head' => "#{user}:#{branch}", 'state' => 'open'}).
-        to_return(:body => Fixture.new('pull_requests/pull_requests.json').to_s, :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/repos/#{user}/#{repo}/pulls").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0', 'base' => 'master', 'head' => "#{user}:#{branch}", 'state' => 'open'}).
-        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 => {'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 => {'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"})
-      stub_get("/repos/#{user}/#{repo}/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_json.to_s, :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
-      # Stubbing pull request commits
-      stub_get("/repos/#{user}/#{repo}/pulls/#{pull.number}/commits").with(query: {"access_token" => "a1b2c3d4e5f6g7h8i9j0"}).
-        to_return(:body => Fixture.new("pull_requests/commits.json").to_s, status: 201, headers: {content_type: "application/json; charset=utf-8"})
-      stub_request(:get, %r{/repos/#{user}/commits/\w+}).with(query: {"access_token" => "a1b2c3d4e5f6g7h8i9j0"}).
-        to_return(:body => Fixture.new("repositories/commit.json").to_s, status: 201, headers: {content_type: "application/json; charset=utf-8"})
-    end
-
-    github_server
-  end
-end
-#
-# the github_api gem does some overrides to Hash so we have to make sure
-# this still works here...
-class Hash
-  def except(*keys)
-    cpy = self.dup
-    keys.each { |key| cpy.delete(key) }
-    cpy
-  end
-end
+$LOAD_PATH << 'lib'
+require 'git_reflow'
+require 'github_api'
+require 'spec_helper'
+
+module GithubHelpers
+  def stub_github_with(options = {})
+
+    hostname         = options[:hostname] || 'hostname.local'
+    api_endpoint     = options[:api_endpoint] || "https://api.github.com"
+    site_url         = options[:site_url] || "https://github.com"
+    user             = options[:user] || 'reenhanced'
+    password         = options[:passwordl] || 'shazam'
+    oauth_token_hash = Hashie::Mash.new({ token: 'a1b2c3d4e5f6g7h8i9j0', note: 'git-reflow (hostname.local)'})
+    repo             = options[:repo] || 'repo'
+    branch           = options[:branch] || 'new-feature'
+    pull             = options[:pull]
+
+    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
+      }
+     return_value = values[question] || values[terminal]
+     question = ""
+     return_value
+    end
+
+    github = Github.new do |config|
+      config.oauth_token = oauth_token_hash.token
+      config.endpoint    = api_endpoint
+      config.site        = site_url
+      config.adapter     = :net_http
+      config.ssl         = {:verify => false}
+    end
+
+    stub_request(:get, "#{api_endpoint}/authorizations?").to_return(:body => [oauth_token_hash].to_json, status: 200, headers: {})
+    allow(Github::Client).to receive(:new).and_return(github)
+    allow(GitReflow).to receive(:push_current_branch).and_return(true)
+    allow(GitReflow).to receive(:git_server).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)
+
+    allow_any_instance_of(GitReflow::GitServer::GitHub).to receive(:run).with('hostname', loud: false).and_return(hostname)
+    github_server = GitReflow::GitServer::GitHub.new
+    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)
+
+    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+}).
+    #  to_return(:body => Fixture.new('repositories/commit.json.erb', repo_owner: user, repo_name: repo, author: user).to_json.to_s, :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+    stub_request(:get, %r{/repos/#{user}/(#{repo}/)?commits/\w+/statuses}).
+      to_return(:body => Fixture.new('repositories/statuses.json').to_s, :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+
+    if pull
+      # Stubbing review
+      stub_post("/repos/#{user}/#{repo}/pulls").
+        to_return(:body => pull.to_s, :status => 201, :headers => {:content_type => "application/json\; charset=utf-8"})
+
+      # Stubbing pull request finder
+      stub_get("/repos/#{user}/#{repo}/pulls/#{pull.number}").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0'}).
+        to_return(:body => Fixture.new('pull_requests/pull_request.json').to_s, :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/repos/#{user}/pulls").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0', 'base' => 'master', 'head' => "#{user}:#{branch}", 'state' => 'open'}).
+        to_return(:body => Fixture.new('pull_requests/pull_requests.json').to_s, :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/repos/#{user}/#{repo}/pulls").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0', 'base' => 'master', 'head' => "#{user}:#{branch}", 'state' => 'open'}).
+        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 => {'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 => {'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"})
+      stub_get("/repos/#{user}/#{repo}/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_json.to_s, :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+      # Stubbing pull request commits
+      stub_get("/repos/#{user}/#{repo}/pulls/#{pull.number}/commits").with(query: {"access_token" => "a1b2c3d4e5f6g7h8i9j0"}).
+        to_return(:body => Fixture.new("pull_requests/commits.json").to_s, status: 201, headers: {content_type: "application/json; charset=utf-8"})
+      stub_request(:get, %r{/repos/#{user}/commits/\w+}).with(query: {"access_token" => "a1b2c3d4e5f6g7h8i9j0"}).
+        to_return(:body => Fixture.new("repositories/commit.json").to_s, status: 201, headers: {content_type: "application/json; charset=utf-8"})
+    end
+
+    github_server
+  end
+end