From 91a7b9333b660abc866e52e1a614151cb529413d Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Wed, 1 Jun 2016 11:23:09 +0200
Subject: Incorportate feedback

---
 spec/features/merge_requests/award_spec.rb | 37 ++++++------------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

(limited to 'spec/features/merge_requests/award_spec.rb')

diff --git a/spec/features/merge_requests/award_spec.rb b/spec/features/merge_requests/award_spec.rb
index 4d3e8173ebe..007f67d6080 100644
--- a/spec/features/merge_requests/award_spec.rb
+++ b/spec/features/merge_requests/award_spec.rb
@@ -3,8 +3,7 @@ require 'rails_helper'
 feature 'Merge request awards', js: true, feature: true do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
-  let(:merge_request) { create(:merge_request_with_diffs, source_project: project) }
-  let!(:note) { create(:note_on_merge_request, project: project, noteable: merge_request, note: 'Looks good!') }
+  let(:merge_request) { create(:merge_request, source_project: project) }
 
   describe 'logged in' do
     before do
@@ -16,12 +15,18 @@ feature 'Merge request awards', js: true, feature: true do
       first('.js-emoji-btn').click
       expect(page).to have_selector('.js-emoji-btn.active')
       expect(first('.js-emoji-btn')).to have_content '1'
+
+      visit namespace_project_merge_request_path(project.namespace, project, merge_request)
+      expect(first('.js-emoji-btn')).to have_content '1'
     end
 
     it 'should remove award from merge request' do
       first('.js-emoji-btn').click
       find('.js-emoji-btn.active').click
       expect(first('.js-emoji-btn')).to have_content '0'
+
+      visit namespace_project_merge_request_path(project.namespace, project, merge_request)
+      expect(first('.js-emoji-btn')).to have_content '0'
     end
 
     it 'should only have one menu on the page' do
@@ -40,33 +45,5 @@ feature 'Merge request awards', js: true, feature: true do
     it 'should not see award menu button' do
       expect(page).not_to have_selector('.js-award-holder')
     end
-
-    it 'should not see award menu button in note' do
-      page.within('.note') do
-        expect(page).not_to have_selector('.js-award-action-btn')
-      end
-    end
-  end
-
-  def show_note_award_menu
-    page.within('.note') do
-      find('.js-add-award').click
-    end
-    expect(page).to have_selector('.emoji-menu')
-  end
-
-  def award_on_note(index = 1)
-    page.within('.emoji-menu') do
-      buttons = all('.js-emoji-btn')
-      buttons[index].click
-    end
-  end
-
-  def remove_award_on_note
-    page.within('.note') do
-      page.within('.js-awards-block') do
-        first('.js-emoji-btn').click
-      end
-    end
   end
 end
-- 
cgit v1.2.1