spec/gitx/cli/integrate_command_spec.rb in gitx-3.0.2.ci.213.1 vs spec/gitx/cli/integrate_command_spec.rb in gitx-3.0.2

@@ -157,13 +157,13 @@
         expect(executor).to receive(:execute).with('git', 'update').ordered
         expect(executor).to receive(:execute).with('git', 'fetch', 'origin').ordered
         expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'staging').ordered
         expect(executor).to receive(:execute).with('git', 'checkout', 'staging').ordered
         expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Integrate feature-branch into staging\n\nConnected to #10", 'feature-branch')
-                                             .and_raise(Gitx::Executor::ExecutionError).ordered
+                                             .and_raise('git merge feature-branch failed').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
-          expect { cli.integrate }.to raise_error(Gitx::Cli::BaseCommand::MergeError, /Merge conflict occurred.  Please fix merge conflict and rerun command with --resume feature-branch flag/)
+          expect { cli.integrate }.to raise_error(/Merge conflict occurred.  Please fix merge conflict and rerun command with --resume feature-branch flag/)
         end
       end
       it 'raises a helpful error' do
         should meet_expectations
       end