spec/gitx/cli/release_command_spec.rb in gitx-3.0.0 vs spec/gitx/cli/release_command_spec.rb in gitx-3.0.1.ci.200.1

- old
+ new

@@ -40,11 +40,11 @@ allow(cli).to receive(:authorization_token).and_return(authorization_token) expect(executor).to receive(:execute).with('git', 'update').ordered expect(executor).to_not receive(:execute).with('git', 'checkout', 'master') expect(executor).to_not receive(:execute).with('git', 'pull', 'origin', 'master') - expect(executor).to_not receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Releasing feature-branch to master (Pull request #10)', 'feature-branch') + expect(executor).to_not receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to master\n\nConnected to #10", 'feature-branch') expect(executor).to_not receive(:execute).with('git', 'push', 'origin', 'HEAD') VCR.use_cassette('pull_request_does_exist_with_failure_status') do cli.release end @@ -62,11 +62,11 @@ expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered expect(executor).to receive(:execute).with('git', 'update').ordered expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered - expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Releasing feature-branch to master (Pull request #10)', 'feature-branch').ordered + expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to master\n\nConnected to #10", 'feature-branch').ordered expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered expect(executor).to receive(:execute).with('git integrate').ordered VCR.use_cassette('pull_request_does_exist_with_success_status') do cli.release @@ -92,11 +92,11 @@ expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered expect(executor).to receive(:execute).with('git', 'update').ordered expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered - expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Releasing feature-branch to master (Pull request #10)', 'feature-branch').ordered + expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to master\n\nConnected to #10", 'feature-branch').ordered expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered expect(executor).to receive(:execute).with('echo hello').ordered VCR.use_cassette('pull_request_does_exist_with_success_status') do cli.release @@ -115,11 +115,11 @@ expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered expect(executor).to receive(:execute).with('git', 'update').ordered expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered - expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Releasing feature-branch to master (Pull request #10)', 'feature-branch').ordered + expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to master\n\nConnected to #10", 'feature-branch').ordered expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered expect(executor).to receive(:execute).with('git integrate').ordered VCR.use_cassette('pull_request_does_exist_with_success_status') do cli.release 'feature-branch' @@ -153,11 +153,11 @@ expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered expect(executor).to receive(:execute).with('git', 'update').ordered expect(executor).to receive(:execute).with('git', 'log', 'origin/master...feature-branch', '--reverse', '--no-merges', '--pretty=format:* %B').and_return('2013-01-01 did some stuff').ordered expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered - expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Releasing feature-branch to master (Pull request #10)', 'feature-branch').ordered + expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to master\n\nConnected to #10", 'feature-branch').ordered expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered expect(executor).to receive(:execute).with('git integrate').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' }) VCR.use_cassette('pull_request_does_not_exist') do @@ -185,10 +185,10 @@ expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered expect(executor).to receive(:execute).with('git', 'update').ordered expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered - expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Releasing feature-branch to master (Pull request #10)', 'feature-branch').ordered + expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to master\n\nConnected to #10", 'feature-branch').ordered expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered expect(executor).to receive(:execute).with('git integrate').ordered expect(executor).to receive(:execute).with('git cleanup').ordered VCR.use_cassette('pull_request_does_exist_with_success_status') do