Write tests for ff-merge and rebase services

app/services/merge_requests/rebase_service.rb

@@ -51,6 +51,9 @@ module MergeRequests
       end
 
       true
+    rescue => ex
+      log('Failed to rebase branch:')
+      log(ex.message)
     ensure
       clean_dir
       Gitlab::ShellEnv.reset_env

features/project/ff_merge_requests.feature

@@ -15,6 +15,8 @@ Feature: Project Ff Merge Requests
     Given rebase before merge enabled
     When I visit merge request page "Bug NS-05"
     Then I should see rebase button
+    When I press rebase button
+    Then I should see rebase in progress message
 
   Scenario: I should do rebase before ff-only merge
     When I visit merge request page "Bug NS-05"

features/steps/project/ff_merge_requests.rb

@@ -72,16 +72,12 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
     project.save!
   end
 
-  step 'I click on "Email Patches"' do
-    click_link "Email Patches"
+  step 'I press rebase button' do
+    click_button "Rebase"
   end
 
-  step 'I click on "Plain Diff"' do
-    click_link "Plain Diff"
-  end
-
-  step 'I should see a patch diff' do
-    expect(page).to have_content('diff --git')
+  step "I should see rebase in progress message" do
+    expect(page).to have_content("Rebase started. It will take some time")
   end
 
   def merge_request

spec/services/merge_requests/ff_merge_service_spec.rb

+require 'spec_helper'
+
+describe MergeRequests::FfMergeService do
+  let(:user) { create(:user) }
+  let(:user2) { create(:user) }
+  let(:merge_request) { create(:merge_request,
+                               source_branch: 'flatten-dir',
+                               target_branch: 'improve/awesome',
+                               assignee: user2) }
+  let(:project) { merge_request.project }
+
+  before do
+    project.team << [user, :master]
+    project.team << [user2, :developer]
+  end
+
+  describe :execute do
+    context 'valid params' do
+      let(:service) { MergeRequests::FfMergeService.new(project, user, {}) }
+
+      before do
+        allow(service).to receive(:execute_hooks)
+
+        service.execute(merge_request)
+      end
+
+      it "should not create merge commit" do
+        source_branch_sha = merge_request.source_project.repository.commit(merge_request.source_branch).sha
+        target_branch_sha = merge_request.target_project.repository.commit(merge_request.target_branch).sha
+        expect(source_branch_sha).to eq(target_branch_sha)
+      end
+
+      it { expect(merge_request).to be_valid }
+      it { expect(merge_request).to be_merged }
+
+      it 'should send email to user2 about merge of new merge_request' do
+        email = ActionMailer::Base.deliveries.last
+        expect(email.to.first).to eq(user2.email)
+        expect(email.subject).to include(merge_request.title)
+      end
+
+      it 'should create system note about merge_request merge' do
+        note = merge_request.notes.last
+        expect(note.note).to include 'Status changed to merged'
+      end
+    end
+  end
+end
+

spec/services/merge_requests/rebase_service_spec.rb

+require 'spec_helper'
+
+describe MergeRequests::RebaseService do
+  let(:user) { create(:user) }
+  let(:merge_request) { create(:merge_request,
+                               source_branch: 'feature_conflict',
+                               target_branch: 'master')}
+  let(:project) { merge_request.project }
+
+  before do
+    project.team << [user, :master]
+  end
+
+  describe :execute do
+    context 'valid params' do
+      let(:service) { MergeRequests::RebaseService.new(project, user, {}) }
+
+      before do
+        service.execute(merge_request)
+      end
+
+      it "should rebase source branch" do
+        parent_sha = merge_request.source_project.repository.commit(merge_request.source_branch).parents.first.sha
+        target_branch_sha = merge_request.target_project.repository.commit(merge_request.target_branch).sha
+        expect(parent_sha).to eq(target_branch_sha)
+      end
+    end
+  end
+end
+
+