consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove new_nested action from documents controller. Use cocoon gem to manage new nested fields creation on documents.

Browse Source
This commit is contained in:
Senén Rodero Rodríguez
2017-09-22 16:30:32 +02:00
parent 3745e76c07
commit 88a7a29d27
24 changed files with 175 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/assets/javascripts/documentable.js.coffee
View File

@@ -1,11 +1,14 @@
App.Documentable = App.Documentable =
initialize: -> initialize: ->
inputFiles = $('input.js-document-attachment[type=file]') $('#nested-documents').on 'cocoon:after-insert', (e, nested_document) ->
input = $(nested_document).find('.js-document-attachment')
$.each inputFiles, (index, input) ->
App.Documentable.initializeDirectUploadInput(input) App.Documentable.initializeDirectUploadInput(input)
if $(nested_document).closest('#nested-documents').find('.document').length >= $('#nested-documents').data('max-documents-allowed')
$('#max-documents-notice').removeClass('hide')
$('#new_document_link').addClass('hide')
initializeDirectUploadInput: (input) -> initializeDirectUploadInput: (input) ->
inputData = @buildData([], input) inputData = @buildData([], input)
@@ -75,8 +78,8 @@ App.Documentable =
data.fileNameContainer = $(wrapper).find('p.file-name') data.fileNameContainer = $(wrapper).find('p.file-name')
data.destroyAttachmentLinkContainer = $(wrapper).find('.action-remove') data.destroyAttachmentLinkContainer = $(wrapper).find('.action-remove')
data.addAttachmentLabel = $(wrapper).find('.action-add label') data.addAttachmentLabel = $(wrapper).find('.action-add label')
data.cachedAttachmentField = $(wrapper).find("#" + $(input).data('cached-attachment-input-field')) data.cachedAttachmentField = $(wrapper).find("input[name$='[cached_attachment]']")
data.titleField = $(wrapper).find("#" + $(input).data('title-input-field')) data.titleField = $(wrapper).find("input[name$='[title]']")
$(wrapper).find('.progress-bar-placeholder').css('display', 'block') $(wrapper).find('.progress-bar-placeholder').css('display', 'block')
return data return data
@@ -119,12 +122,13 @@ App.Documentable =
App.Documentable.clearInputErrors(data) App.Documentable.clearInputErrors(data)
App.Documentable.clearProgressBar(data) App.Documentable.clearProgressBar(data)
$('#new_document_link').removeClass('hide')
$('#max-documents-notice').addClass('hide')
$(data.wrapper).find(".attachment-actions").addClass('small-12').removeClass('small-6 float-right')
$(data.wrapper).find(".attachment-actions .action-remove").addClass('small-3').removeClass('small-12')
if $(data.input).data('nested-document') == true if $(data.input).data('nested-document') == true
$(data.wrapper).remove() $(data.wrapper).remove()
$('#new_document_link').show()
$('.max-documents-notice').hide()
else
$(data.destroyAttachmentLinkContainer).find('a.delete').remove()
initializeRemoveDocumentLink: (input) -> initializeRemoveDocumentLink: (input) ->
wrapper = $(input).closest(".direct-upload") wrapper = $(input).closest(".direct-upload")
@@ -132,8 +136,8 @@ App.Documentable =
$(remove_document_link).on 'click', (e) -> $(remove_document_link).on 'click', (e) ->
e.preventDefault() e.preventDefault()
$(wrapper).remove() $(wrapper).remove()
$('#new_document_link').show() $('#new_document_link').removeClass('hide')
$('.max-documents-notice').hide() $('#max-documents-notice').addClass('hide')
initializeRemoveCachedDocumentLink: (input, data) -> initializeRemoveCachedDocumentLink: (input, data) ->
wrapper = $(input).closest(".direct-upload") wrapper = $(input).closest(".direct-upload")
@@ -143,23 +147,5 @@ App.Documentable =
e.stopPropagation() e.stopPropagation()
App.Documentable.doDeleteCachedAttachmentRequest(this.href, data) App.Documentable.doDeleteCachedAttachmentRequest(this.href, data)
new: (nested_field) ->
nested_field = $(nested_field)
$(".documents-list").append(nested_field)
input = nested_field.find("input[type='file']")
@initializeDirectUploadInput(input)
destroyNestedDocument: (id) -> destroyNestedDocument: (id) ->
$('#' + id).remove() $('#' + id).remove()
updateNewDocumentButton: (link) ->
if $('.document').length >= $('.documents').data('max-documents')
$('#new_document_link').hide()
$('.max-documents-notice').removeClass('hide')
$('.max-documents-notice').show()
else if $('#new_document_link').length > 0
$('#new_document_link').replaceWith(link)
$('.max-documents-notice').hide()
else
$('.max-documents-notice').hide()
$(link).insertBefore('.documents hr:last')

1
app/assets/javascripts/imageable.js.coffee
View File

@@ -114,6 +114,7 @@ App.Imageable =
$(data.errorContainer).append(errors) $(data.errorContainer).append(errors)
setPreview: (data) -> setPreview: (data) ->
console.log 'App.Imageable.setPreview'
image_preview = '<div class="small-12 column text-center image-preview"><figure><img src="' + data.result.attachment_url + '" class="cached-image"/></figure></div>' image_preview = '<div class="small-12 column text-center image-preview"><figure><img src="' + data.result.attachment_url + '" class="cached-image"/></figure></div>'
if $(data.preview).length > 0 if $(data.preview).length > 0
$(data.preview).replaceWith(image_preview) $(data.preview).replaceWith(image_preview)

4
app/assets/stylesheets/mixins.scss
View File

@@ -47,6 +47,10 @@
.document-form, .document-form,
.image-form { .image-form {
.title{
margin-bottom: $line-height;
}
.document, .document,
.image-form { .image-form {
.file-name { .file-name {

4
app/assets/stylesheets/participation.scss
View File

@@ -315,7 +315,9 @@
} }
.budget-investment-new, .budget-investment-new,
.proposal-form { .proposal-form,
.proposal-edit,
.image-form {
@include upload-image-documents; @include upload-image-documents;
} }

5
app/controllers/documents_controller.rb
View File

@@ -1,7 +1,7 @@
class DocumentsController < ApplicationController class DocumentsController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
before_action :find_documentable, except: :destroy before_action :find_documentable, except: :destroy
before_action :prepare_new_document, only: [:new, :new_nested] before_action :prepare_new_document, only: [:new]
before_action :prepare_document_for_creation, only: :create before_action :prepare_document_for_creation, only: :create
load_and_authorize_resource load_and_authorize_resource
@@ -9,9 +9,6 @@ class DocumentsController < ApplicationController
def new def new
end end
def new_nested
end
def create def create
recover_attachments_from_cache recover_attachments_from_cache

41
app/helpers/documents_helper.rb
View File

@@ -17,24 +17,14 @@ module DocumentsHelper
bytes / Numeric::MEGABYTE bytes / Numeric::MEGABYTE
end end
def document_nested_field_name(document, index, field)
parent = document.documentable_type.parameterize.underscore
"#{parent.parameterize}[documents_attributes][#{index}][#{field}]"
end
def document_nested_field_id(document, index, field)
parent = document.documentable_type.parameterize.underscore
"#{parent.parameterize}_documents_attributes_#{index}_#{field}"
end
def document_nested_field_wrapper_id(index) def document_nested_field_wrapper_id(index)
"document_#{index}" "document_#{index}"
end end
def render_destroy_document_link(document, index) def render_destroy_document_link(document)
if document.persisted? if document.persisted?
link_to t('documents.form.delete_button'), link_to t('documents.form.delete_button'),
document_path(document, index: index, nested_document: true), document_path(document, nested_document: true),
method: :delete, method: :delete,
remote: true, remote: true,
data: { confirm: t('documents.actions.destroy.confirm') }, data: { confirm: t('documents.actions.destroy.confirm') },
@@ -55,25 +45,18 @@ module DocumentsHelper
end end
end end
def render_attachment(document, index) def render_attachment(builder, document)
html = file_field_tag :attachment, html = builder.file_field :attachment,
accept: accepted_content_types_extensions(document.documentable_type.constantize), label: false,
class: 'js-document-attachment', accept: accepted_content_types_extensions(document.documentable_type.constantize),
data: { class: 'js-document-attachment',
url: document_direct_upload_url(document), data: {
cached_attachment_input_field: document_nested_field_id(document, index, :cached_attachment), url: document_direct_upload_url(document),
title_input_field: document_nested_field_id(document, index, :title), nested_document: true
multiple: false, }
index: index,
nested_document: true
},
name: document_nested_field_name(document, index, :attachment),
id: document_nested_field_id(document, index, :attachment)
if document.attachment.blank? && document.cached_attachment.blank? if document.attachment.blank? && document.cached_attachment.blank?
klass = document.errors[:attachment].any? ? "error" : "" klass = document.errors[:attachment].any? ? "error" : ""
html += label_tag document_nested_field_id(document, index, :attachment), html += builder.label :attachment, t("documents.upload_document"), class: "button hollow"
t("documents.form.attachment_label"),
class: "button hollow #{klass}"
if document.errors[:attachment].any? if document.errors[:attachment].any?
html += content_tag :small, class: "error" do html += content_tag :small, class: "error" do
document_errors_on_attachment(document) document_errors_on_attachment(document)

2
app/models/abilities/common.rb
View File

@@ -38,7 +38,7 @@ module Abilities
can [:create, :destroy], Follow can [:create, :destroy], Follow
can [:create, :destroy, :new], Document, documentable: { author_id: user.id } can [:create, :destroy, :new], Document, documentable: { author_id: user.id }
can [:new_nested, :upload, :destroy_upload], Document can [:upload, :destroy_upload], Document
can [:create, :destroy, :new], Image, imageable: { author_id: user.id } can [:create, :destroy, :new], Image, imageable: { author_id: user.id }
can [:new_nested, :upload, :destroy_upload], Image can [:new_nested, :upload, :destroy_upload], Image

1
app/models/budget/investment.rb
View File

@@ -12,7 +12,6 @@ class Budget
documentable max_documents_allowed: 3, documentable max_documents_allowed: 3,
max_file_size: 3.megabytes, max_file_size: 3.megabytes,
accepted_content_types: [ "application/pdf" ] accepted_content_types: [ "application/pdf" ]
accepts_nested_attributes_for :documents, allow_destroy: true
acts_as_votable acts_as_votable
acts_as_paranoid column: :hidden_at acts_as_paranoid column: :hidden_at

1
app/models/concerns/documentable.rb
View File

@@ -3,6 +3,7 @@ module Documentable
included do included do
has_many :documents, as: :documentable, dependent: :destroy has_many :documents, as: :documentable, dependent: :destroy
accepts_nested_attributes_for :documents, allow_destroy: true
end end
module ClassMethods module ClassMethods

1
app/models/proposal.rb
View File

@@ -15,7 +15,6 @@ class Proposal < ActiveRecord::Base
documentable max_documents_allowed: 3, documentable max_documents_allowed: 3,
max_file_size: 3.megabytes, max_file_size: 3.megabytes,
accepted_content_types: [ "application/pdf" ] accepted_content_types: [ "application/pdf" ]
accepts_nested_attributes_for :documents, allow_destroy: true
include EmbedVideosHelper include EmbedVideosHelper
acts_as_votable acts_as_votable

4
app/views/budgets/investments/_form.html.erb
View File

@@ -25,8 +25,8 @@
<%= render 'images/nested_images', imageable: @investment %> <%= render 'images/nested_images', imageable: @investment %>
</div> </div>
<div class="documents small-12 column" data-max-documents="<%= Budget::Investment.max_documents_allowed %>"> <div class="documents small-12 column">
<%= render 'documents/nested_documents', documentable: @investment %> <%= render 'documents/nested_documents', documentable: @investment, f: f %>
</div> </div>
<div class="small-12 column"> <div class="small-12 column">

31
app/views/documents/_document_fields.html.erb Normal file
View File

@@ -0,0 +1,31 @@
<div id="<%= dom_id(f.object) %>" class="document direct-upload">
<%= f.hidden_field :id %>
<%= f.hidden_field :user_id, value: current_user.id %>
<%= f.hidden_field :cached_attachment %>
<div class="small-12 column title">
<%= f.text_field :title, placeholder: t("documents.new.form.title_placeholder") %>
</div>
<div class="small-12 column attachment-actions">
<div class="small-9 column action-add attachment-errors document-attachment">
<%= render_attachment(f, f.object) %>
</div>
<div class="small-3 column action-remove text-right">
<%= render_destroy_document_link(f.object) %>
</div>
</div>
<div class="small-6 column">
<p class="file-name">
<%= document_attachment_file_name(f.object) %>
</p>
</div>
<div class="small-12 column">
<div class="progress-bar-placeholder"><div class="loading-bar"></div></div>
</div>
<hr>
</div>

2
app/views/documents/_form.html.erb
View File

@@ -12,7 +12,7 @@
<%= f.hidden_field :cached_attachment %> <%= f.hidden_field :cached_attachment %>
<div class="small-12 column"> <div class="small-12 column title">
<%= f.text_field :title, placeholder: t("documents.new.form.title_placeholder") %> <%= f.text_field :title, placeholder: t("documents.new.form.title_placeholder") %>
</div> </div>

44
app/views/documents/_nested_documents.html.erb
View File

@@ -1,23 +1,31 @@
<div class="documents-list"> <div class="documents-list">
<%= label_tag :documents, t("documents.form.title") %> <%= f.label :documents, t("documents.form.title") %>
<p class="help-text"><%= documentables_note(documentable) %></p> <p class="help-text"><%= documentables_note(documentable) %></p>
<% documentable.documents.each_with_index do |document, index| %> <div id="nested-documents" data-max-documents-allowed="<%= documentable.class.max_documents_allowed%>">
<%= render 'documents/nested_fields', document: document, index: index %> <%= f.fields_for :documents do |documents_builder| %>
<% end %> <%= render 'documents/document_fields', f: documents_builder %>
<% end %>
</div>
<%= link_to_add_association t('documents.form.add_new_document'), f, :documents,
partial: "documents/document_fields",
render_options: {
locals: {
document: Document.new(documentable: documentable)
},
},
id: "new_document_link",
class: "button hollow",
data: {
association_insertion_node: "#nested-documents",
association_insertion_method: "append"
} %>
<div id="max-documents-notice" class="max-documents-notice callout warning text-center <%= "hide" unless max_documents_allowed?(documentable) %>">
<%= t "documents.max_documents_allowed_reached_html" %>
</div>
<hr>
</div> </div>
<% unless max_documents_allowed?(documentable) %>
<%= link_to t("documents.form.add_new_document"),
new_nested_documents_path(documentable_type: documentable.class.name, index: documentable.documents.size),
remote: true,
id: "new_document_link",
class: "button hollow" %>
<% end %>
<div class="max-documents-notice callout warning text-center <%= "hide" unless max_documents_allowed?(documentable) %>">
<%= t "documents.max_documents_allowed_reached_html" %>
</div>
<hr>

48
app/views/documents/_nested_fields.html.erb
View File

@@ -1,48 +0,0 @@
<div id="<%= document_nested_field_wrapper_id(index) %>" class="document direct-upload">
<%= hidden_field_tag :id,
document.id,
name: document_nested_field_name(document, index, :id),
id: document_nested_field_id(document, index, :id) if document.persisted? %>
<%= hidden_field_tag :user_id,
current_user.id,
name: document_nested_field_name(document, index, :user_id),
id: document_nested_field_id(document, index, :user_id) %>
<%= hidden_field_tag :cached_attachment,
document.cached_attachment,
name: document_nested_field_name(document, index, :cached_attachment),
id: document_nested_field_id(document, index, :cached_attachment) %>
<div class="small-12 column">
<%= label_tag :title, t("activerecord.attributes.document.title") %>
<%= text_field_tag :title,
document.title,
placeholder: t("documents.new.form.title_placeholder"),
name: document_nested_field_name(document, index, :title),
id: document_nested_field_id(document, index, :title),
class: "document-title" %>
<% if document.errors[:title].any? %>
<small class="error"><%= document.errors[:title].join(", ") %></small>
<% end %>
</div>
<div class="small-12 column attachment-actions">
<div class="small-9 column action-add attachment-errors document-attachment">
<%= render_attachment(document, index) %>
</div>
<div class="small-3 column action-remove text-right">
<%= render_destroy_document_link(document, index) %>
</div>
</div>
<div class="small-6 column">
<p class="file-name">
<%= document_attachment_file_name(document) %>
</p>
</div>
<div class="small-12 column">
<div class="progress-bar-placeholder"><div class="loading-bar"></div></div>
</div>
<hr>
</div>

8
app/views/documents/destroy.js.erb
View File

@@ -1,7 +1 @@
App.Documentable.destroyNestedDocument("<%= document_nested_field_wrapper_id(params[:index]) %>") App.Documentable.destroyNestedDocument("<%= dom_id(@document) %>")
<% new_document_link = link_to t("documents.form.add_new_document"),
new_nested_documents_path(documentable_type: @document.documentable_type, index: params[:index]),
remote: true,
id: "new_document_link",
class: "button hollow" %>
App.Documentable.updateNewDocumentButton("<%= j new_document_link %>")

9
app/views/documents/new_nested.js.erb
View File

@@ -1,9 +0,0 @@
<%
new_document_link = link_to t("documents.form.add_new_document"),
new_nested_documents_path(documentable_type: params[:documentable_type], index: params[:index].to_i + 1),
remote: true,
id: "new_document_link",
class: "button hollow"
%>
App.Documentable.new("<%= j render('documents/nested_fields', document: @document, index: params[:index]) %>")
App.Documentable.updateNewDocumentButton("<%= j new_document_link %>")

2
app/views/images/_form.html.erb
View File

@@ -12,7 +12,7 @@
<%= f.hidden_field :cached_attachment %> <%= f.hidden_field :cached_attachment %>
<div class="small-12 column"> <div class="small-12 column title">
<%= f.text_field :title, placeholder: t("images.new.form.title_placeholder") %> <%= f.text_field :title, placeholder: t("images.new.form.title_placeholder") %>
</div> </div>

8
app/views/images/_nested_fields.html.erb
View File

@@ -12,15 +12,17 @@
name: image_nested_field_name(image, :cached_attachment), name: image_nested_field_name(image, :cached_attachment),
id: image_nested_field_id(image, :cached_attachment) %> id: image_nested_field_id(image, :cached_attachment) %>
<div class="small-12 column"> <div class="small-12 column title">
<%= label_tag :title, t("activerecord.attributes.image.title") %> <%= label_tag :title,
t("activerecord.attributes.image.title"),
class: image.errors[:title].any? ? "error" : "" %>
<%= text_field_tag :title, <%= text_field_tag :title,
image.title, image.title,
placeholder: t("images.new.form.title_placeholder"), placeholder: t("images.new.form.title_placeholder"),
name: image_nested_field_name(image, :title), name: image_nested_field_name(image, :title),
id: image_nested_field_id(image, :title), id: image_nested_field_id(image, :title),
class: "image-title" %> class: image.errors[:title].any? ? "error" : "" %>
<% if image.errors[:title].any? %> <% if image.errors[:title].any? %>
<small class="error"><%= image.errors[:title].join(", ") %></small> <small class="error"><%= image.errors[:title].join(", ") %></small>
<% end %> <% end %>

4
app/views/proposals/_form.html.erb
View File

@@ -50,8 +50,8 @@
<%= render 'images/nested_images', imageable: @proposal %> <%= render 'images/nested_images', imageable: @proposal %>
</div> </div>
<div class="documents small-12 column" data-max-documents="<%= Proposal.max_documents_allowed %>"> <div class="documents small-12 column">
<%= render 'documents/nested_documents', documentable: @proposal %> <%= render 'documents/nested_documents', documentable: @proposal, f: f %>
</div> </div>
<div class="small-12 medium-6 column"> <div class="small-12 medium-6 column">

4
config/routes.rb
View File

@@ -100,9 +100,7 @@ Rails.application.routes.draw do
resources :follows, only: [:create, :destroy] resources :follows, only: [:create, :destroy]
resources :documents, only: [:new, :create, :destroy] do resources :documents, only: [:new, :create, :destroy]
get :new_nested, on: :collection
end
resources :images, only: [:new, :create, :destroy] do resources :images, only: [:new, :create, :destroy] do
get :new_nested, on: :collection get :new_nested, on: :collection

3
spec/features/proposals_spec.rb
View File

@@ -1290,6 +1290,8 @@ feature 'Proposals' do
it_behaves_like "followable", "proposal", "proposal_path", { "id": "id" } it_behaves_like "followable", "proposal", "proposal_path", { "id": "id" }
describe "xxx" do
it_behaves_like "imageable", "proposal", "proposal_path", { "id": "id" } it_behaves_like "imageable", "proposal", "proposal_path", { "id": "id" }
it_behaves_like "nested imageable", it_behaves_like "nested imageable",
@@ -1325,6 +1327,7 @@ feature 'Proposals' do
nil, nil,
"Save changes", "Save changes",
"Proposal updated successfully" "Proposal updated successfully"
end
scenario 'Erased author' do scenario 'Erased author' do
user = create(:user) user = create(:user)

1
spec/models/abilities/common_spec.rb
View File

@@ -92,7 +92,6 @@ describe "Abilities::Common" do
it { should_not be_able_to(:create, DirectMessage) } it { should_not be_able_to(:create, DirectMessage) }
it { should_not be_able_to(:show, DirectMessage) } it { should_not be_able_to(:show, DirectMessage) }
it { should be_able_to(:new_nested, Document) }
it { should be_able_to(:destroy_upload, Document) } it { should be_able_to(:destroy_upload, Document) }
it { should be_able_to(:new, own_proposal_document) } it { should be_able_to(:new, own_proposal_document) }

99
spec/shared/features/nested_documentable.rb
View File

@@ -12,7 +12,7 @@ shared_examples "nested documentable" do |documentable_factory_name, path, docum
create(:administrator, user: administrator) create(:administrator, user: administrator)
documentable_path_arguments&.each do |argument_name, path_to_value| documentable_path_arguments&.each do |argument_name, path_to_value|
arguments.merge!("#{argument_name}": documentable.send(path_to_value)) arguments.merge!("#{argument_name}": documentable.send(path_to_value))
end end
end end
@@ -30,9 +30,7 @@ shared_examples "nested documentable" do |documentable_factory_name, path, docum
visit send(path, arguments) visit send(path, arguments)
click_link "Add new document" click_link "Add new document"
expect(page).to have_css "##{documentable_factory_name}_documents_attributes_0_title"
click_link "Add new document" click_link "Add new document"
expect(page).to have_css "##{documentable_factory_name}_documents_attributes_1_title"
click_link "Add new document" click_link "Add new document"
expect(page).to have_css "#new_document_link", visible: false expect(page).to have_css "#new_document_link", visible: false
@@ -49,11 +47,9 @@ shared_examples "nested documentable" do |documentable_factory_name, path, docum
login_as user login_as user
visit send(path, arguments) visit send(path, arguments)
click_link "Add new document" documentable.class.max_documents_allowed.times.each do
expect(page).to have_css "##{documentable_factory_name}_documents_attributes_0_title" click_link "Add new document"
click_link "Add new document" end
expect(page).to have_css "##{documentable_factory_name}_documents_attributes_1_title"
click_link "Add new document"
expect(page).to have_css ".max-documents-notice", visible: true expect(page).to have_css ".max-documents-notice", visible: true
end end
@@ -63,14 +59,10 @@ shared_examples "nested documentable" do |documentable_factory_name, path, docum
visit send(path, arguments) visit send(path, arguments)
click_link "Add new document" click_link "Add new document"
expect(page).to have_css "##{documentable_factory_name}_documents_attributes_0_title"
click_link "Add new document" click_link "Add new document"
expect(page).to have_css "##{documentable_factory_name}_documents_attributes_1_title"
click_link "Add new document" click_link "Add new document"
expect(page).to have_css "##{documentable_factory_name}_documents_attributes_2_title"
within "#document_0" do all("a", text: "Remove document").last.click
find("a", text: "Remove document").click
end
expect(page).to have_css ".max-documents-notice", visible: false expect(page).to have_css ".max-documents-notice", visible: false
end end
@@ -80,7 +72,10 @@ shared_examples "nested documentable" do |documentable_factory_name, path, docum
visit send(path, arguments) visit send(path, arguments)
click_link "Add new document" click_link "Add new document"
attach_file("#{documentable_factory_name}[documents_attributes][0][attachment]", "spec/fixtures/files/empty.pdf", make_visible: true) within "#nested-documents" do
document = find(".document input[type=file]", visible: false)
attach_file(document[:id], "spec/fixtures/files/empty.pdf", make_visible: true)
end
expect(page).to have_css ".file-name", text: "empty.pdf" expect(page).to have_css ".file-name", text: "empty.pdf"
end end
@@ -91,7 +86,7 @@ shared_examples "nested documentable" do |documentable_factory_name, path, docum
documentable_attach_new_file(documentable_factory_name, 0, "spec/fixtures/files/empty.pdf") documentable_attach_new_file(documentable_factory_name, 0, "spec/fixtures/files/empty.pdf")
expect(find("##{documentable_factory_name}_documents_attributes_0_title").value).to eq('empty.pdf') expect_document_has_title(0, "empty.pdf")
end end
scenario "Should not update nested document file title with file name after choosing a file when title already defined", :js do scenario "Should not update nested document file title with file name after choosing a file when title already defined", :js do
@@ -99,11 +94,13 @@ shared_examples "nested documentable" do |documentable_factory_name, path, docum
visit send(path, arguments) visit send(path, arguments)
click_link "Add new document" click_link "Add new document"
within "#nested-documents .document" do
fill_in "#{documentable_factory_name}[documents_attributes][0][title]", with: "Title" input = find("input[name$='[title]']")
fill_in input[:id], with: "My Title"
end
documentable_attach_new_file(documentable_factory_name, 0, "spec/fixtures/files/empty.pdf") documentable_attach_new_file(documentable_factory_name, 0, "spec/fixtures/files/empty.pdf")
expect(find("##{documentable_factory_name}_documents_attributes_0_title").value).to eq "Title" expect_document_has_title(0, "My Title")
end end
scenario "Should update loading bar style after valid file upload", :js do scenario "Should update loading bar style after valid file upload", :js do
@@ -111,7 +108,6 @@ shared_examples "nested documentable" do |documentable_factory_name, path, docum
visit send(path, arguments) visit send(path, arguments)
documentable_attach_new_file(documentable_factory_name, 0, "spec/fixtures/files/empty.pdf") documentable_attach_new_file(documentable_factory_name, 0, "spec/fixtures/files/empty.pdf")
fill_in "#{documentable_factory_name}[documents_attributes][0][title]", with: "Title"
expect(page).to have_css ".loading-bar.complete" expect(page).to have_css ".loading-bar.complete"
end end
@@ -131,7 +127,7 @@ shared_examples "nested documentable" do |documentable_factory_name, path, docum
documentable_attach_new_file(documentable_factory_name, 0, "spec/fixtures/files/empty.pdf") documentable_attach_new_file(documentable_factory_name, 0, "spec/fixtures/files/empty.pdf")
expect(page).to have_css("input[name='#{documentable_factory_name}[documents_attributes][0][cached_attachment]'][value$='.pdf']", visible: false) expect_document_has_cached_attachment(0, ".pdf")
end end
scenario "Should not update document cached_attachment field after unvalid file upload", :js do scenario "Should not update document cached_attachment field after unvalid file upload", :js do
@@ -140,7 +136,7 @@ shared_examples "nested documentable" do |documentable_factory_name, path, docum
documentable_attach_new_file(documentable_factory_name, 0, "spec/fixtures/files/logo_header.png", false) documentable_attach_new_file(documentable_factory_name, 0, "spec/fixtures/files/logo_header.png", false)
expect(find("input[name='#{documentable_factory_name}[documents_attributes][0][cached_attachment]']", visible: false).value).to eq("") expect_document_has_cached_attachment(0, "")
end end
scenario "Should show document errors after documentable submit with empty document fields", :js do scenario "Should show document errors after documentable submit with empty document fields", :js do
@@ -148,10 +144,9 @@ shared_examples "nested documentable" do |documentable_factory_name, path, docum
visit send(path, arguments) visit send(path, arguments)
click_link "Add new document" click_link "Add new document"
expect(page).to have_css("input[name='#{documentable_factory_name}[documents_attributes][0][title]']")
click_on submit_button click_on submit_button
within "#document_0" do within "#nested-documents .document" do
expect(page).to have_content("can't be blank", count: 2) expect(page).to have_content("can't be blank", count: 2)
end end
end end
@@ -161,11 +156,9 @@ shared_examples "nested documentable" do |documentable_factory_name, path, docum
visit send(path, arguments) visit send(path, arguments)
documentable_attach_new_file(documentable_factory_name, 0, "spec/fixtures/files/empty.pdf") documentable_attach_new_file(documentable_factory_name, 0, "spec/fixtures/files/empty.pdf")
within "#document_0" do click_link "Remove document"
click_link "Remove document"
end
expect(page).not_to have_css("#document_0") expect(page).not_to have_css("#nested-documents .document")
end end
scenario "Should show successful notice when resource filled correctly without any nested documents", :js do scenario "Should show successful notice when resource filled correctly without any nested documents", :js do
@@ -202,7 +195,7 @@ shared_examples "nested documentable" do |documentable_factory_name, path, docum
end end
scenario "Should show resource with new document after successful creation with maximum allowed uploaded files", :js do scenario "Should show resource with new document after successful creation with maximum allowed uploaded files", :js do
skip "due to unknown error" skip "weird behavior"
# page.driver.resize_window 1200, 2500 # page.driver.resize_window 1200, 2500
login_as user login_as user
visit send(path, arguments) visit send(path, arguments)
@@ -216,9 +209,32 @@ shared_examples "nested documentable" do |documentable_factory_name, path, docum
click_on submit_button click_on submit_button
documentable_redirected_to_resource_show_or_navigate_to documentable_redirected_to_resource_show_or_navigate_to
save_screenshot
expect(page).to have_content "Documents (#{documentable.class.max_documents_allowed})" expect(page).to have_content "Documents (#{documentable.class.max_documents_allowed})"
end end
if path.include? "edit"
scenario "Should show persisted documents and remove nested_field" do
login_as user
create(:document, documentable: documentable)
visit send(path, arguments)
expect(page).to have_css ".document", count: 1
end
scenario "Should remove nested field after remove document", :js do
login_as user
create(:document, documentable: documentable)
visit send(path, arguments)
click_on "Remove document"
expect(page).not_to have_css ".document"
end
end
end end
end end
@@ -232,11 +248,10 @@ end
def documentable_attach_new_file(documentable_factory_name, index, path, success = true) def documentable_attach_new_file(documentable_factory_name, index, path, success = true)
click_link "Add new document" click_link "Add new document"
input_file_id = "#{documentable_factory_name}_documents_attributes_#{index}_attachment" document = all(".document")[index]
expect(page).to have_css("##{input_file_id}", visible: false) document_input = document.find("input[type=file]", visible: false)
attach_file(input_file_id, path, make_visible: true) attach_file(document_input[:id], path, make_visible: true)
within document do
within "#document_#{index}" do
if success if success
expect(page).to have_css ".loading-bar.complete" expect(page).to have_css ".loading-bar.complete"
else else
@@ -245,6 +260,22 @@ def documentable_attach_new_file(documentable_factory_name, index, path, success
end end
end end
def expect_document_has_title(index, title)
document = all(".document")[index]
within document do
expect(find("input[name$='[title]']").value).to eq title
end
end
def expect_document_has_cached_attachment(index, extension)
document = all(".document")[index]
within document do
expect(find("input[name$='[cached_attachment]']", visible: false).value).to end_with(extension)
end
end
def documentable_fill_new_valid_proposal def documentable_fill_new_valid_proposal
fill_in :proposal_title, with: "Proposal title #{rand(9999)}" fill_in :proposal_title, with: "Proposal title #{rand(9999)}"
fill_in :proposal_summary, with: "Proposal summary" fill_in :proposal_summary, with: "Proposal summary"