git-process 1.0.11 → 1.1.0

data/spec/github_pull_request_spec.rb

@@ -1,22 +1,12 @@
 require 'git-process/pull_request'
 require 'GitRepoHelper'
-require 'webmock/rspec'
+require 'github_test_helper'
 require 'json'
 require 'octokit'
 require 'tempfile'
 
-
-describe GitHub::PullRequest do
-  include GitRepoHelper
-
-
-  def lib
-    unless @lib
-      @lib = double('lib')
-      @lib.stub(:logger).and_return(logger)
-    end
-    @lib
-  end
+describe GitHub::PullRequest, :git_repo_helper do
+  include GitHubTestHelper
 
 
   def test_token
@@ -25,34 +15,32 @@ describe GitHub::PullRequest do
 
 
   def pull_request
-    @pr ||= GitHub::PullRequest.new(lib, 'test_repo', :user => 'test_user')
+    @pr ||= GitHub::PullRequest.new(gitlib, 'test_remote', 'test_repo', :user => 'test_user')
   end
 
 
   before(:each) do
-    lib.stub(:config).with('gitProcess.github.authToken').and_return(test_token)
-    lib.stub(:config).with('remote.origin.url').and_return('git@github.com:jdigger/git-process.git')
+    gitlib.config['gitProcess.github.authToken'] = test_token
+    gitlib.remote.add('test_remote', 'git@github.com:test_repo.git')
   end
 
 
-  describe "#create" do
+  describe '#create' do
 
-    it "should return a pull request for a good request" do
-      stub_request(:post, "https://api.github.com/repos/test_repo/pulls?access_token=#{test_token}").
-          to_return(:status => 200, :body => JSON({:number => 1, :state => 'open'}))
+    it 'should return a pull request for a good request' do
+      stub_post('https://api.github.com/repos/test_repo/pulls', :body => {:number => 1, :state => 'open'})
 
       pull_request.create('test_base', 'test_head', 'test title', 'test body')[:state].should == 'open'
     end
 
 
-    it "should handle asking for a duplicate pull request" do
+    it 'should handle asking for a duplicate pull request' do
       # trying to create the request should return "HTTP 422: Unprocessable Entity" because it already exists
-      stub_request(:post, "https://api.github.com/repos/test_repo/pulls?access_token=#{test_token}").
-          to_return(:status => 422)
+      stub_post("https://api.github.com/repos/test_repo/pulls", :status => 422)
 
       # listing all existing pull requests should contain the current branch
-      stub_request(:get, /test_repo\/pulls\?access_token=/).
-          to_return(:status => 200, :body => JSON([{:html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}]))
+      stub_get('https://api.github.com/repos/test_repo/pulls?state=open', :status => 200,
+               :body => [{:html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}])
 
       pull_request.create('test_base', 'test_head', 'test title', 'test body')[:html_url].should == 'test_url'
     end
@@ -60,31 +48,47 @@ describe GitHub::PullRequest do
   end
 
 
-  describe "#close" do
+  describe "get" do
+
+    it "should return a pull request for a good request" do
+      stub_get('https://api.github.com/repos/test_repo/pulls/1', :body => {:number => 1, :state => 'open'})
+
+      pull_request.pull_request(1)[:state].should == 'open'
+    end
+
+  end
+
+
+  describe '#close' do
 
     it "should close a good current pull request" do
-      stub_request(:get, /test_repo\/pulls\?access_token=/).
-          to_return(:status => 200, :body => JSON([{:number => 1, :state => 'open', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}]))
-      stub_request(:patch, /test_repo\/pulls\/1\?access_token=/).with(:body => JSON({:state => 'closed'})).
-          to_return(:status => 200, :body => JSON({:number => 1, :state => 'closed', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}))
+      stub_get('https://api.github.com/repos/test_repo/pulls?state=open', :body => [{:number => 1, :state => 'open', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}])
+      stub_patch('https://api.github.com/repos/test_repo/pulls/1', :send => JSON({:state => 'closed'}),
+                 :body => {:number => 1, :state => 'closed', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}})
 
       pull_request.close('test_base', 'test_head')[:state].should == 'closed'
     end
 
 
     it "should close a good current pull request using the pull request number" do
-      stub_request(:patch, /test_repo\/pulls\/1\?access_token=/).with(:body => JSON({:state => 'closed'})).
-          to_return(:status => 200, :body => JSON({:number => 1, :state => 'closed', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}))
+      stub_patch('https://api.github.com/repos/test_repo/pulls/1', :send => JSON({:state => 'closed'}),
+                 :body => {:number => 1, :state => 'closed', :html_url => 'test_url',
+                           :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}})
 
       pull_request.close(1)[:state].should == 'closed'
     end
 
 
     it "should complain about a missing pull request" do
-      stub_request(:get, /test_repo\/pulls\?access_token=/).
-          to_return(:status => 200, :body => JSON([{:number => 1, :state => 'open', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}]))
+      stub_get('https://api.github.com/repos/test_repo/pulls?state=open', :body => [{:number => 1, :state => 'open', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}])
+
+      expect { pull_request.close('test_base', 'missing_head') }.to raise_error GitHub::PullRequest::NotFoundError
+    end
+
 
-      expect { pull_request.close('test_base', 'missing_head') }.should raise_error GitHub::PullRequest::NotFoundError
+    it "should complain about wrong number of arguments" do
+      expect { pull_request.close() }.to raise_error ::ArgumentError
+      expect { pull_request.close('1', '2', '3') }.to raise_error ::ArgumentError
     end
 
   end

data/spec/github_test_helper.rb

@@ -0,0 +1,49 @@
+require 'FileHelpers'
+require 'git-process/git_process'
+require 'webmock/rspec'
+
+module GitHubTestHelper
+
+
+  def stub_get(url, opts = {})
+    stub = stub_request(:get, url)
+
+    if opts[:token]
+      stub.with(:Authorization => "token #{opts[:token]}")
+    end
+
+    stub.to_return(:status => opts[:status] ? opts[:status] : 200, :body => opts[:body] ? opts[:body] : '')
+    stub
+  end
+
+
+  def stub_post(url, opts = {})
+    stub = stub_request(:post, url)
+
+    if opts[:token]
+      stub.with(:Authorization => "token #{opts[:token]}")
+    end
+
+    stub.to_return(:status => opts[:status] ? opts[:status] : 200, :body => opts[:body] ? opts[:body] : '')
+
+    stub
+  end
+
+
+  def stub_patch(url, opts = {})
+    stub = stub_request(:patch, url)
+
+    if opts[:token]
+      stub.with(:Authorization => "token #{opts[:token]}")
+    end
+
+    if opts[:send]
+      stub.with(:body => opts[:send])
+    end
+
+    stub.to_return(:status => opts[:status] ? opts[:status] : 200, :body => opts[:body] ? opts[:body] : '')
+
+    stub
+  end
+
+end

data/spec/new_fb_spec.rb

@@ -1,58 +1,99 @@
 require 'git-process/new_fb'
 require 'GitRepoHelper'
+include GitProc
 
-describe GitProc::NewFeatureBranch do
+
+describe NewFeatureBranch do
   include GitRepoHelper
 
   before(:each) do
-    create_files(['.gitignore'])
-    gitprocess.commit('initial')
+    create_files(%w(.gitignore))
+    gitlib.commit('initial')
   end
 
 
   after(:each) do
-    rm_rf(tmpdir)
+    rm_rf(gitlib.workdir)
   end
 
 
-  def create_process(dir, opts)
+  def create_process(dir, opts = {})
     opts[:branch_name] = 'test_branch'
-    GitProc::NewFeatureBranch.new(dir, opts)
+    NewFeatureBranch.new(dir, opts)
   end
 
 
-  describe "#new_feature_branch" do
+  describe '#new_feature_branch' do
 
     def log_level
       Logger::ERROR
     end
 
 
-    it "should create the named branch against origin/master" do
-      clone do |gp|
+    it 'should create the named branch against origin/master' do
+      clone_repo do |gl|
+        gp = create_process(gl)
+        gl.checkout('other_branch', :new_branch => 'master')
+        change_file_and_commit('a', '', gl)
+        change_file_and_commit('b', '', gl)
         new_branch = gp.runner
 
         new_branch.name.should == 'test_branch'
-        new_branch.sha.should == gp.branches['origin/master'].sha
+        new_branch.sha.should == gl.branches['origin/master'].sha
       end
     end
 
 
     it "should bring committed changes on _parking_ over to the new branch" do
-      gitprocess.branch('origin/master', :base_branch => 'master')
-      gitprocess.checkout('_parking_', :new_branch => 'master')
-      change_file_and_commit('a', '')
-      change_file_and_commit('b', '')
+      clone_repo do |gl|
+        gl.checkout('_parking_', :new_branch => 'master')
+        change_file_and_commit('a', '', gl)
+        change_file_and_commit('b', '', gl)
 
-      new_branch = gitprocess.runner
+        gp = create_process(gl)
+        new_branch = gp.runner
 
-      new_branch.name.should == 'test_branch'
-      Dir.chdir(gitprocess.workdir) do |dir|
-        File.exists?('a').should be_true
-        File.exists?('b').should be_true
+        new_branch.name.should == 'test_branch'
+        Dir.chdir(gl.workdir) do |_|
+          File.exists?('a').should be_true
+          File.exists?('b').should be_true
+        end
+
+        gl.config["branch.test_branch.remote"].should == 'origin'
+        gl.config["branch.test_branch.merge"].should == 'refs/heads/master'
+
+        gl.fetch
+        gl.branches.parking.should be_nil
+        new_branch.sha.should_not == gl.branches['origin/master'].sha
+      end
+
+    end
+
+
+    it "should move new branch over to the integration branch" do
+      clone_repo do |gl|
+        gl.checkout('_parking_', :new_branch => 'master')
+        change_file_and_commit('a', '', gitlib)
+        change_file_and_commit('b', '', gitlib)
+
+        gl.fetch
+        gp = create_process(gl)
+        new_branch = gp.runner
+
+        new_branch.name.should == 'test_branch'
+        Dir.chdir(gitlib.workdir) do |_|
+          File.exists?('a').should be_true
+          File.exists?('b').should be_true
+        end
+
+        gl.config["branch.test_branch.remote"].should == 'origin'
+        gl.config["branch.test_branch.merge"].should == 'refs/heads/master'
+
+        gl.fetch
+        gl.branches.parking.should be_nil
+        new_branch.sha.should == gl.branches['origin/master'].sha
       end
 
-      gitprocess.branches.parking.should be_nil
     end
 
 
@@ -66,8 +107,8 @@ describe GitProc::NewFeatureBranch do
 
 
     it "should bring new/uncommitted changes on _parking_ over to the new branch" do
-      gitprocess.branch('origin/master', :base_branch => 'master')
-      gitprocess.checkout('_parking_', :new_branch => 'master')
+      gitlib.branch('origin/master', :base_branch => 'master')
+      gitlib.checkout('_parking_', :new_branch => 'master')
       change_file_and_commit('a', '')
       change_file_and_add('b', '')
       change_file('c', '')
@@ -75,13 +116,13 @@ describe GitProc::NewFeatureBranch do
       new_branch = gitprocess.runner
 
       new_branch.name.should == 'test_branch'
-      Dir.chdir(gitprocess.workdir) do |dir|
+      Dir.chdir(gitlib.workdir) do |_|
         File.exists?('a').should be_true
         File.exists?('b').should be_true
         File.exists?('c').should be_true
       end
 
-      gitprocess.branches.parking.should be_nil
+      gitlib.branches.parking.should be_nil
     end
 
   end

data/spec/pull_request_helper.rb

@@ -0,0 +1,94 @@
+module PullRequestHelper
+
+  def create_pull_request(opts = {})
+    v = {
+        :head_remote => 'testrepo',
+        :head_repo => 'test_repo',
+        :base_repo => 'test_repo',
+        :head_branch => 'test_branch',
+        :base_branch => 'source_branch',
+        :api_url => 'https://api.github.com',
+        :pr_number => '32',
+        :state => 'open',
+    }
+    v.merge! opts
+    v[:ssh_head_url] = "git@github.com:#{opts[:head_repo] || v[:head_repo]}.git" unless opts.has_key?(:ssh_head_url)
+    v[:ssh_base_url] = "git@github.com:#{opts[:base_repo] || v[:base_repo]}.git" unless opts.has_key?(:ssh_base_url)
+    PullRequestHelper::_basic_pull_request_data(v)
+  end
+
+
+  def self._basic_pull_request_data(opts = {})
+    {
+        :number => opts[:pr_number],
+        :state => opts[:state],
+        :head => {
+            :remote => opts[:head_repo], # pseudo-property for testing
+            :ref => opts[:head_branch],
+            :repo => {
+                :name => opts[:head_repo],
+                :ssh_url => opts[:ssh_head_url],
+            }
+        },
+        :base => {
+            :remote => opts[:base_repo], # pseudo-property for testing
+            :ref => opts[:base_branch],
+            :repo => {
+                :name => opts[:base_repo],
+                :ssh_url => opts[:ssh_base_url],
+            }
+        }
+    }
+  end
+
+
+  # @abstract the Hash/JSON of the pull request structure to use
+  # @return [Hash]
+  def pull_request
+    raise NotImplementedError
+  end
+
+
+  def api_url(remote_name, glib = gitlib)
+    GitHubService::Configuration.new(glib.config, :remote_name => remote_name).base_github_api_url_for_remote
+  end
+
+
+  def stub_get_pull_request(pr, glib = gitlib)
+    api_url = api_url(pr[:head][:remote], glib)
+    stub_get("#{api_url}/repos/#{pr[:head][:repo][:name]}/pulls/#{pr[:number]}", :body => pr)
+  end
+
+
+  def stub_fetch(which_remote, glib = gitlib)
+    rem = pull_request[which_remote][:remote]
+    glib.stub(:fetch).with(rem)
+  end
+
+
+  #
+  # Adds a remote to git's configuration based on {#pull_request}
+  #
+  # @param [:head, :base] which_remote
+  #
+  def add_remote(which_remote, glib = gitlib)
+    glib.remote.add(pull_request[which_remote][:remote], pull_request[which_remote][:repo][:ssh_url])
+  end
+
+
+  # Verifies the branch is checked out from the HEAD branch of the pull
+  #   request and created by the same name
+  def expect_checkout_pr_head(glib = gitlib)
+    pr = pull_request
+    glib.should_receive(:checkout).with(pr[:head][:ref], :new_branch => "#{pr[:head][:remote]}/#{pr[:head][:ref]}")
+  end
+
+
+  # Verifies the tracking for the new branch is set to the BASE branch
+  #   of the pull request
+  def expect_upstream_set(glib = gitlib)
+    pr = pull_request
+    glib.should_receive(:branch).with(pr[:head][:ref], :upstream => "#{pr[:base][:remote]}/#{pr[:base][:ref]}")
+  end
+
+end

data/spec/pull_request_spec.rb

@@ -0,0 +1,128 @@
+require 'git-process/pull_request'
+#require 'git-process/github_configuration'
+require 'github_test_helper'
+require 'pull_request_helper'
+require 'GitRepoHelper'
+
+
+describe GitProc::PullRequest do
+  include GitRepoHelper
+  include GitHubTestHelper
+
+  before(:each) do
+    create_files(%w(.gitignore))
+    gitlib.commit('initial')
+  end
+
+
+  after(:each) do
+    rm_rf(gitlib.workdir)
+  end
+
+
+  def log_level
+    Logger::ERROR
+  end
+
+
+  describe 'with no parameters' do
+    def create_process(dir, opts)
+      GitProc::PullRequest.new(dir, opts)
+    end
+
+
+    it 'should push the branch and create a default pull request' do
+      pr_client = double('pr_client')
+
+      gitlib.config['gitProcess.integrationBranch'] = 'develop'
+      gitlib.remote.add('origin', 'git@github.com:jdigger/git-process.git')
+
+      GitProc::PullRequest.stub(:create_pull_request_client).and_return(pr_client)
+      #PullRequest.stub(:create_pull_request_client).with(anything, 'origin', 'jdigger/git-process').and_return(pr_client)
+      gitlib.should_receive(:push)
+      pr_client.should_receive(:create).with('develop', 'master', 'master', '')
+
+      gitprocess.runner
+    end
+
+
+    it "should fail if the base and head branch are the same" do
+      gitlib.remote.add('origin', 'git@github.com:jdigger/git-process.git')
+
+      expect {
+        gitprocess.runner
+      }.to raise_error GitProc::PullRequestError
+    end
+
+  end
+
+
+  describe 'checkout pull request' do
+    include PullRequestHelper
+
+    before(:each) do
+      gitlib.config['gitProcess.github.authToken'] = 'sdfsfsdf'
+      gitlib.config['github.user'] = 'jdigger'
+    end
+
+
+    describe "with PR #" do
+
+      def pull_request
+        @pr ||= create_pull_request({})
+      end
+
+
+      def create_process(dir, opts)
+        GitProc::PullRequest.new(dir, opts.merge({:prNumber => pull_request[:number]}))
+      end
+
+
+      it "should checkout the branch for the pull request" do
+        add_remote(:head)
+        stub_fetch(:head)
+
+        stub_get_pull_request(pull_request)
+
+        expect_checkout_pr_head()
+        expect_upstream_set()
+
+        gitprocess.runner
+      end
+
+    end
+
+
+    describe "with repo name and PR #" do
+
+      def pull_request
+        @pr ||= create_pull_request(:base_remote => 'sourcerepo', :base_repo => 'source_repo')
+      end
+
+
+      def create_process(dir, opts)
+        GitProc::PullRequest.new(dir, opts.merge({:prNumber => pull_request[:number],
+                                                  :server => pull_request[:head][:remote]}))
+      end
+
+
+      it "should checkout the branch for the pull request" do
+        add_remote(:head)
+        add_remote(:base)
+        stub_fetch(:head)
+        stub_fetch(:base)
+        gitlib.config['gitProcess.remoteName'] = pull_request[:head][:repo][:name]
+
+        stub_get_pull_request(pull_request)
+
+        expect_checkout_pr_head()
+        expect_upstream_set()
+
+        gitprocess.runner
+      end
+
+    end
+
+  end
+
+end