Fix tests for EE after CE merge

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

features/project/project.feature

@@ -67,9 +67,10 @@ Feature: Project
   Scenario: I should see audit events
     And gitlab user "Pete"
     And "Pete" is "Shop" developer
-    When I visit project "Shop" settings page
+    When I visit project "Shop" page
     And I go to "Members"
     And I change "Pete" access level to master
+    And I visit project "Shop" settings page
     And I go to "Audit Events"
     Then I should see the audit event listed
 

features/steps/groups_management.rb

@@ -24,7 +24,6 @@ class Spinach::Features::GroupsManagement < Spinach::FeatureSteps
 
   step 'I go to "Open" project members page' do
     click_link 'Sourcing / Open'
-    click_link 'Settings'
     click_link 'Members'
   end
 

features/steps/project/merge_requests.rb

@@ -334,21 +334,24 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     merge_request = MergeRequest.find_by!(title: "Bug NS-04")
     project = merge_request.target_project
     project.approvals_before_merge = 1
+    project.ensure_satellite_exists
     project.save!
   end
 
   step 'I click link "Approve"' do
-    click_button 'Approve Merge Request'
+    within '.mr-state-widget' do
+      click_button 'Approve Merge Request'
+    end
   end
 
   step 'I should not see merge button' do
-    within '.can_be_merged' do
+    within '.mr-state-widget' do
       page.should_not have_button("Accept Merge Request")
     end
   end
 
   step 'I should see approved merge request "Bug NS-04"' do
-    within '.can_be_merged' do
+    within '.mr-state-widget' do
       page.should have_button("Accept Merge Request")
     end
   end