spec/gitx/cli/integrate_command_spec.rb in gitx-2.13.2 vs spec/gitx/cli/integrate_command_spec.rb in gitx-2.13.3

@@ -36,11 +36,11 @@
         expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
         expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
 
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate
         end
       end
@@ -89,11 +89,11 @@
         expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
         expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
 
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate
         end
       end
@@ -113,11 +113,11 @@
         expect(cli).to receive(:run_cmd).with('git checkout prototype').ordered
         expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
 
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate 'prototype'
         end
       end
@@ -172,11 +172,11 @@
 
         expect(cli).not_to receive(:run_cmd).with('git branch -D staging')
         expect(cli).not_to receive(:run_cmd).with('git push origin HEAD')
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch')
 
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate
         end
       end
@@ -199,11 +199,11 @@
 
         expect(cli).not_to receive(:run_cmd).with('git branch -D staging')
         expect(cli).not_to receive(:run_cmd).with('git push origin HEAD')
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
 
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate
         end
       end
       it 'asks user for feature-branch name' do
@@ -225,22 +225,22 @@
         expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
         expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
 
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate
         end
       end
       it 'defaults to staging branch' do
         should meet_expectations
       end
       it 'posts comment to pull request' do
-        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').
-          with(body: {body: '[gitx] integrated into staging :twisted_rightwards_arrows:'})
+        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments')
+          .with(body: { body: '[gitx] integrated into staging :twisted_rightwards_arrows:' })
       end
     end
     context 'with --comment flag when a pull request doesn\'t exist for the feature-branch' do
       let(:options) do
         { comment: true }
@@ -269,22 +269,22 @@
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
         expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %s%n%b'").and_return('2013-01-01 did some stuff').ordered
 
-        stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/pulls').to_return(:status => 201, :body => new_pull_request.to_json, :headers => {'Content-Type' => 'application/json'})
-        stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').to_return(:status => 201)
+        stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/pulls').to_return(status: 201, body: new_pull_request.to_json, headers: { 'Content-Type' => 'application/json' })
+        stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_not_exist') do
           cli.integrate
         end
       end
       it 'creates github pull request' do
         should meet_expectations
       end
       it 'creates github comment for integration' do
-        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').
-          with(body: {body: '[gitx] integrated into staging :twisted_rightwards_arrows:'})
+        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments')
+          .with(body: { body: '[gitx] integrated into staging :twisted_rightwards_arrows:' })
       end
     end
   end
 end