Merge branch 'master' into polls-admin-polish

spec/features/admin/poll/questions/answers/answers_spec.rb

@@ -4,7 +4,7 @@ feature 'Answers' do
 
   background do
     admin = create(:administrator)
-    login_as (admin.user)
+    login_as admin.user
   end
 
   scenario 'Create' do
@@ -24,9 +24,27 @@ feature 'Answers' do
     expect(page).to have_content(description)
   end
 
+  scenario 'Create second answer and place after the first one' do
+    question = create(:poll_question)
+    answer = create(:poll_question_answer, title: 'First', question: question, given_order: 1)
+    title = 'Second'
+    description = "Description"
+
+    visit admin_question_path(question)
+    click_link 'Add answer'
+
+    fill_in 'poll_question_answer_title', with: title
+    fill_in 'poll_question_answer_description', with: description
+
+    click_button 'Save'
+
+    expect(page.body.index('First')).to be < page.body.index('Second')
+  end
+
   scenario 'Update' do
     question = create(:poll_question)
-    answer = create(:poll_question_answer, question: question, title: "Answer title")
+    answer = create(:poll_question_answer, question: question, title: "Answer title", given_order: 2)
+    answer2 = create(:poll_question_answer, question: question, title: "Another title", given_order: 1)
 
     visit admin_answer_path(answer)
 
@@ -46,6 +64,8 @@ feature 'Answers' do
 
     expect(page).to have_content(new_title)
     expect(page).to_not have_content(old_title)
+
+    expect(page.body.index(new_title)).to be < page.body.index(answer2.title)
   end
 
 end