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

2017-10-06 01:12:22 +02:00
parent 5862eea516 806fd85246
commit c72f95c72b
42 changed files with 460 additions and 277 deletions
--- a/spec/features/admin/poll/questions/answers/images/images_spec.rb
+++ b/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