Merge branch 'master' into aperez-edit-poll-question-answers

spec/shared/features/nested_documentable.rb

@@ -191,9 +191,17 @@ shared_examples "nested documentable" do |login_as_name, documentable_factory_na
 
       documentable_attach_new_file(documentable_factory_name, 0, "spec/fixtures/files/empty.pdf")
       click_on submit_button
+
       documentable_redirected_to_resource_show_or_navigate_to
 
-      expect(page).to have_content "Documents (1)"
+      expect(page).to have_content "Documents"
+
+      find("#tab-documents-label").click
+      expect(page).to have_content "empty.pdf"
+
+      #Review
+      #Doble check why the file is stored with a name different to empty.pdf
+      expect(page).to have_css("a[href$='.pdf']")
     end
 
     scenario "Should show resource with new document after successful creation with maximum allowed uploaded files", :js do

spec/shared/features/nested_imageable.rb

@@ -146,7 +146,11 @@ shared_examples "nested imageable" do |imageable_factory_name, path, imageable_p
       send(fill_resource_method_name) if fill_resource_method_name
       click_on submit_button
 
-      expect(page).to have_content imageable_success_notice
+      if has_many_images
+         skip "no need to test, there are no attributes for the parent resource"
+      else
+        expect(page).to have_content imageable_success_notice
+      end
     end
 
     scenario "Should show successful notice when resource filled correctly and after valid file uploads", :js do