Merge branch 'master' into aperez-admin-question-videos

spec/features/admin/poll/polls_spec.rb

@@ -70,14 +70,18 @@ feature 'Admin polls' do
 
   scenario "Edit" do
     poll = create(:poll)
+    create(:image, imageable: poll)
 
     visit admin_poll_path(poll)
     click_link "Edit"
 
     end_date = 1.year.from_now
 
+    expect(page).to have_css("img[alt='#{poll.image.title}']")
+
     fill_in "poll_name", with: "Next Poll"
     fill_in 'poll_ends_at', with: end_date.strftime("%d/%m/%Y")
+
     click_button "Update poll"
 
     expect(page).to have_content "Poll updated successfully"

spec/features/admin/poll/questions/answers/images/images_spec.rb

@@ -0,0 +1,14 @@
+require 'rails_helper'
+
+feature 'Images' do
+
+  background do
+    admin = create(:administrator)
+    login_as(admin.user)
+  end
+
+  pending "Index"
+  pending "Create"
+  pending "Destroy"
+
+end

spec/features/admin/poll/shifts_spec.rb

@@ -31,6 +31,8 @@ feature 'Admin shifts' do
   end
 
   scenario "Create Vote Collection Shift and Recount & Scrutiny Shift on same date", :js do
+    create(:poll)
+    create(:poll, :incoming)
     poll = create(:poll, :current)
     booth = create(:poll_booth)
     assignment = create(:poll_booth_assignment, poll: poll, booth: booth)