diff --git a/spec/features/comments/budget_investments_spec.rb b/spec/features/comments/budget_investments_spec.rb index 7a688afd2..e1b700ae0 100644 --- a/spec/features/comments/budget_investments_spec.rb +++ b/spec/features/comments/budget_investments_spec.rb @@ -1,5 +1,4 @@ require "rails_helper" -include ActionView::Helpers::DateHelper describe "Commenting Budget::Investments" do let(:user) { create :user } diff --git a/spec/features/comments/debates_spec.rb b/spec/features/comments/debates_spec.rb index 86cc31723..731beda03 100644 --- a/spec/features/comments/debates_spec.rb +++ b/spec/features/comments/debates_spec.rb @@ -1,5 +1,4 @@ require "rails_helper" -include ActionView::Helpers::DateHelper describe "Commenting debates" do let(:user) { create :user } diff --git a/spec/features/comments/legislation_annotations_spec.rb b/spec/features/comments/legislation_annotations_spec.rb index e09e423fe..18b9f40d2 100644 --- a/spec/features/comments/legislation_annotations_spec.rb +++ b/spec/features/comments/legislation_annotations_spec.rb @@ -1,5 +1,4 @@ require "rails_helper" -include ActionView::Helpers::DateHelper describe "Commenting legislation questions" do let(:user) { create :user } diff --git a/spec/features/comments/legislation_questions_spec.rb b/spec/features/comments/legislation_questions_spec.rb index 39a2b4c28..67510cae2 100644 --- a/spec/features/comments/legislation_questions_spec.rb +++ b/spec/features/comments/legislation_questions_spec.rb @@ -1,5 +1,4 @@ require "rails_helper" -include ActionView::Helpers::DateHelper describe "Commenting legislation questions" do let(:user) { create :user, :level_two } diff --git a/spec/features/comments/polls_spec.rb b/spec/features/comments/polls_spec.rb index e7953a3ec..b224e32a4 100644 --- a/spec/features/comments/polls_spec.rb +++ b/spec/features/comments/polls_spec.rb @@ -1,5 +1,4 @@ require "rails_helper" -include ActionView::Helpers::DateHelper describe "Commenting polls" do let(:user) { create :user } diff --git a/spec/features/comments/proposals_spec.rb b/spec/features/comments/proposals_spec.rb index f0c1d42204..e1f5c7daf 100644 --- a/spec/features/comments/proposals_spec.rb +++ b/spec/features/comments/proposals_spec.rb @@ -1,5 +1,4 @@ require "rails_helper" -include ActionView::Helpers::DateHelper describe "Commenting proposals" do let(:user) { create :user } diff --git a/spec/features/comments/topics_spec.rb b/spec/features/comments/topics_spec.rb index e5a44bfa8..0ebc30cf7 100644 --- a/spec/features/comments/topics_spec.rb +++ b/spec/features/comments/topics_spec.rb @@ -1,5 +1,4 @@ require "rails_helper" -include ActionView::Helpers::DateHelper describe "Commenting topics from proposals" do let(:user) { create :user } diff --git a/spec/shared/features/documentable.rb b/spec/shared/features/documentable.rb index 5eb40d605..c360859d8 100644 --- a/spec/shared/features/documentable.rb +++ b/spec/shared/features/documentable.rb @@ -1,6 +1,4 @@ shared_examples "documentable" do |documentable_factory_name, documentable_path, documentable_path_arguments| - include ActionView::Helpers - let(:administrator) { create(:user) } let(:user) { create(:user) } let(:arguments) { {} } @@ -134,7 +132,7 @@ shared_examples "documentable" do |documentable_factory_name, documentable_path, click_on "Delete document" end - within "##{dom_id(documentable)}" do + within "##{ActionView::RecordIdentifier.dom_id(documentable)}" do expect(page).to have_selector "h1", text: documentable.title end end diff --git a/spec/shared/features/followable.rb b/spec/shared/features/followable.rb index 8bfbca12b..885ee5d9d 100644 --- a/spec/shared/features/followable.rb +++ b/spec/shared/features/followable.rb @@ -1,10 +1,12 @@ shared_examples "followable" do |followable_class_name, followable_path, followable_path_arguments| - include ActionView::Helpers - let!(:arguments) { {} } let!(:followable) { create(followable_class_name) } let!(:followable_dom_name) { followable_class_name.tr("_", "-") } + def dom_id(record) + ActionView::RecordIdentifier.dom_id(record) + end + before do followable_path_arguments.each do |argument_name, path_to_value| arguments.merge!("#{argument_name}": followable.send(path_to_value)) diff --git a/spec/shared/features/imageable.rb b/spec/shared/features/imageable.rb index fa78b2b07..b66823029 100644 --- a/spec/shared/features/imageable.rb +++ b/spec/shared/features/imageable.rb @@ -1,8 +1,4 @@ shared_examples "imageable" do |imageable_factory_name, imageable_path, imageable_path_arguments| - include ActionView::Helpers - include ImagesHelper - include ImageablesHelper - let!(:administrator) { create(:user) } let!(:user) { create(:user) } let!(:imageable_arguments) { {} } diff --git a/spec/shared/features/mappable.rb b/spec/shared/features/mappable.rb index 59488bd7c..063b02851 100644 --- a/spec/shared/features/mappable.rb +++ b/spec/shared/features/mappable.rb @@ -1,6 +1,4 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name, mappable_new_path, mappable_edit_path, mappable_show_path, mappable_path_arguments, management: false| - include ActionView::Helpers - let!(:user) { create(:user, :level_two) } let!(:arguments) { {} } let!(:mappable) { create(mappable_factory_name.to_s.to_sym) } diff --git a/spec/shared/features/nested_documentable.rb b/spec/shared/features/nested_documentable.rb index 01a1c8b38..3a461b12b 100644 --- a/spec/shared/features/nested_documentable.rb +++ b/spec/shared/features/nested_documentable.rb @@ -1,8 +1,4 @@ shared_examples "nested documentable" do |login_as_name, documentable_factory_name, path, documentable_path_arguments, fill_resource_method_name, submit_button, documentable_success_notice| - include ActionView::Helpers - include DocumentsHelper - include DocumentablesHelper - let!(:administrator) { create(:user) } let!(:user) { create(:user, :level_two) } let!(:arguments) { {} } diff --git a/spec/shared/features/nested_imageable.rb b/spec/shared/features/nested_imageable.rb index 4ea707588..19592858f 100644 --- a/spec/shared/features/nested_imageable.rb +++ b/spec/shared/features/nested_imageable.rb @@ -1,8 +1,4 @@ shared_examples "nested imageable" do |imageable_factory_name, path, imageable_path_arguments, fill_resource_method_name, submit_button, imageable_success_notice, has_many_images = false| - include ActionView::Helpers - include ImagesHelper - include ImageablesHelper - let!(:user) { create(:user, :level_two) } let!(:administrator) { create(:administrator, user: user) } let!(:arguments) { {} } diff --git a/spec/shared/models/image_validations.rb b/spec/shared/models/image_validations.rb index e3a59b684..7285b1937 100644 --- a/spec/shared/models/image_validations.rb +++ b/spec/shared/models/image_validations.rb @@ -1,5 +1,4 @@ shared_examples "image validations" do |imageable_factory| - include ImagesHelper include ImageablesHelper let!(:image) { build(:image, imageable_factory.to_sym) }