1 files changed, 41 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_approves_spec.rb b/spec/features/merge_request/user_approves_spec.rb
new file mode 100644
index 00000000000..d319fdcb87b
--- /dev/null
+++ b/spec/features/merge_request/user_approves_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Merge request > User approves', :js do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :public, :repository) }
+  let(:merge_request) { create(:merge_request, source_project: project) }
+
+  before do
+    project.add_developer(user)
+
+    sign_in(user)
+
+    visit project_merge_request_path(project, merge_request)
+  end
+
+  it 'approves merge request' do
+    click_approval_button('Approve')
+    expect(page).to have_content('Merge request approved')
+
+    verify_approvals_count_on_index!
+
+    click_approval_button('Revoke approval')
+    expect(page).to have_content('No approval required; you can still approve')
+  end
+
+  def verify_approvals_count_on_index!
+    visit(project_merge_requests_path(project, state: :all))
+    expect(page.all('li').any? { |item| item["title"] == "1 approver (you've approved)"}).to be true
+    visit project_merge_request_path(project, merge_request)
+  end
+
+  def click_approval_button(action)
+    page.within('.mr-state-widget') do
+      click_button(action)
+    end
+
+    wait_for_requests
+  end
+end