fix spinach after CE->EE merge

db/schema.rb

@@ -886,7 +886,7 @@ ActiveRecord::Schema.define(version: 20160331223143) do
   create_table "remote_mirrors", force: :cascade do |t|
     t.integer  "project_id"
     t.string   "url"
-    t.boolean  "enabled",                   default: true
+    t.boolean  "enabled",                    default: true
     t.string   "update_status"
     t.datetime "last_update_at"
     t.datetime "last_successful_update_at"
@@ -1131,4 +1131,5 @@ ActiveRecord::Schema.define(version: 20160331223143) do
   add_index "web_hooks", ["created_at", "id"], name: "index_web_hooks_on_created_at_and_id", using: :btree
   add_index "web_hooks", ["project_id"], name: "index_web_hooks_on_project_id", using: :btree
 
+  add_foreign_key "remote_mirrors", "projects"
 end

features/project/merge_requests.feature

@@ -372,10 +372,11 @@ Feature: Project Merge Requests
     When I should not see Approve button
     And I should see message that MR require an approval
 
+  @javascript
   Scenario: I see suggested approvers on new merge request form
     Given project settings contain list of approvers
     When I click link "New Merge Request"
-    And I select "fix" as source
+    And I select "feature_conflict" as source
     Then I see suggested approver
 
   @javascript
@@ -383,6 +384,6 @@ Feature: Project Merge Requests
     Given project settings contain list of approvers
     And there is one auto-suggested approver
     When I click link "New Merge Request"
-    And I select "fix" as source
+    And I select "feature_conflict" as source
     Then I see auto-suggested approver
     And I can add it to approver list

features/steps/project/merge_requests.rb

@@ -468,11 +468,20 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
   step 'I select "fix" as source' do
     find('.js-source-branch').click
+
     find('.dropdown-source-branch .dropdown-content a', text: 'fix').click
 
     click_button "Compare branches"
   end
 
+  step 'I select "feature_conflict" as source' do
+    find('.js-source-branch').click
+
+    find('.dropdown-source-branch .dropdown-content a', text: 'feature_conflict').click
+
+    click_button "Compare branches"
+  end
+
   step 'I should see description field pre-filled' do
     expect(find_field('merge_request_description').value).to eq 'This merge request should contain the following.'
   end