spec/gitx/cli/release_command_spec.rb in gitx-2.21.4 vs spec/gitx/cli/release_command_spec.rb in gitx-2.21.5.ci.151.1
- old
+ new
@@ -150,10 +150,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', 'feature-branch').ordered
expect(executor).to receive(:execute).with('git', 'update').ordered
- expect(executor).to receive(:execute).with('git', 'log', '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', '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', 'push', 'origin', 'HEAD').ordered
expect(executor).to receive(:execute).with('git integrate').ordered