integrate_command_spec.rb in gitx-4.0.0.ci.234.1

- old
+ new

@@ -45,22 +45,22 @@
       end
       it 'defaults to staging branch' do
         should meet_expectations
       end
     end
-    context 'when current_branch == master' do
-      let(:current_branch) { double('fake branch', name: 'master', head?: true) }
-      let(:local_branch_names) { ['master'] }
+    context 'when current_branch == main' do
+      let(:current_branch) { double('fake branch', name: 'main', head?: true) }
+      let(:local_branch_names) { ['main'] }
       let(:remote_branch_names) { ['origin/staging'] }
       before do
         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 master into staging', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Integrate main into staging', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
 
         cli.integrate
       end
       it 'does not create pull request' do
         expect(WebMock).to_not have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/pulls')
@@ -83,11 +83,11 @@
         allow(cli).to receive(:ask_editor).and_return('description')
 
         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', 'origin/master...feature-branch', '--reverse', '--no-merges', '--pretty=format:* %B').and_return(changelog).ordered
+        expect(executor).to receive(:execute).with('git', 'log', 'origin/main...feature-branch', '--reverse', '--no-merges', '--pretty=format:* %B').and_return(changelog).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').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
@@ -107,10 +107,10 @@
       end
     end
     context 'when staging branch does not exist remotely' do
       let(:remote_branch_names) { [] }
       before do
-        expect(repo).to receive(:create_branch).with('staging', 'master')
+        expect(repo).to receive(:create_branch).with('staging', 'main')
 
         expect(executor).to receive(:execute).with('git', 'update').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'staging:staging').ordered
         expect(executor).to receive(:execute).with('git', 'fetch', 'origin').ordered
         expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'staging').and_raise(Gitx::Executor::ExecutionError).ordered