Merge branch 'master' into dashboard

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

@@ -1,63 +1,69 @@
-require 'rails_helper'
+require "rails_helper"
 
-feature 'Answers' do
+feature "Answers" do
 
   background do
     admin = create(:administrator)
     login_as admin.user
   end
 
-  scenario 'Create' do
+  it_behaves_like "translatable",
+                  "poll_question_answer",
+                  "edit_admin_answer_path",
+                  %w[title],
+                  { "description" => :ckeditor }
+
+  scenario "Create" do
     question = create(:poll_question)
-    title = 'Whatever the question may be, the answer is always 42'
+    title = "Whatever the question may be, the answer is always 42"
     description = "The Hitchhiker's Guide To The Universe"
 
     visit admin_question_path(question)
-    click_link 'Add answer'
+    click_link "Add answer"
 
-    fill_in 'poll_question_answer_title_en', with: title
-    fill_in 'poll_question_answer_description_en', with: description
+    fill_in "Answer", with: title
+    fill_in "Description", with: description
 
-    click_button 'Save'
+    click_button "Save"
 
     expect(page).to have_content(title)
     expect(page).to have_content(description)
   end
 
-  scenario 'Create second answer and place after the first one' do
+  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'
+    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'
+    click_link "Add answer"
 
-    fill_in 'poll_question_answer_title_en', with: title
-    fill_in 'poll_question_answer_description_en', with: description
+    fill_in "Answer", with: title
+    fill_in "Description", with: description
 
-    click_button 'Save'
+    click_button "Save"
 
-    expect(page.body.index('First')).to be < page.body.index('Second')
+    expect(page.body.index("First")).to be < page.body.index("Second")
   end
 
-  scenario 'Update' do
+  scenario "Update" do
     question = create(:poll_question)
     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)
 
-    click_link 'Edit answer'
+    click_link "Edit answer"
 
     old_title = answer.title
-    new_title = 'Ex Machina'
+    new_title = "Ex Machina"
 
-    fill_in 'poll_question_answer_title_en', with: new_title
+    fill_in "Answer", with: new_title
 
-    click_button 'Save'
+    click_button "Save"
 
-    expect(page).to have_content('Changes saved')
+    expect(page).to have_content("Changes saved")
     expect(page).to have_content(new_title)
 
     visit admin_question_path(question)