+
+ <% combined_images = [@page_text.hero_image.attachment, @page_text.about_us_images].flatten.compact%>
+ <%= render partial: "components/image_attachment_table", locals: { images: combined_images } %>
+
<% end %>
-
diff --git a/app/views/organizations/pets/tabs/_photos.html.erb b/app/views/organizations/pets/tabs/_photos.html.erb
index 0dda18aaf..7fb271eae 100644
--- a/app/views/organizations/pets/tabs/_photos.html.erb
+++ b/app/views/organizations/pets/tabs/_photos.html.erb
@@ -1,4 +1,4 @@
<%= render "components/attachment_form", instance: @pet, title: 'Photos', url: attach_images_pet_path(@pet), attachment_type: 'images' %>
- <%= render "components/image_attachment_table", pet: @pet %>
+ <%= render "components/image_attachment_table", images: @pet.images %>
diff --git a/test/controllers/organizations/home_controller_test.rb b/test/controllers/organizations/home_controller_test.rb
index 00eea3f14..525f37f18 100644
--- a/test/controllers/organizations/home_controller_test.rb
+++ b/test/controllers/organizations/home_controller_test.rb
@@ -2,7 +2,9 @@
class Organizations::HomeControllerTest < ActionDispatch::IntegrationTest
setup do
- @organization = create(:organization)
+ @organization = create(:organization, :with_page_text)
+ @organization.save
+ Current.organization = @organization
end
context "GET #index" do
diff --git a/test/controllers/organizations/page_texts_controller_test.rb b/test/controllers/organizations/page_texts_controller_test.rb
index 73a1343df..dff81b072 100644
--- a/test/controllers/organizations/page_texts_controller_test.rb
+++ b/test/controllers/organizations/page_texts_controller_test.rb
@@ -46,6 +46,7 @@ class Organizations::PageTextsControllerTest < ActionDispatch::IntegrationTest
context "PATCH #update" do
should "update page text" do
patch page_text_path(@page_text), params: {page_text: {hero: "Super Dog", about: "canine caped crusader"}}
+ @page_text.reload
assert_response :redirect
follow_redirect!
assert_response :success
diff --git a/test/factories/organizations.rb b/test/factories/organizations.rb
index e716b8adf..eb7411fc3 100644
--- a/test/factories/organizations.rb
+++ b/test/factories/organizations.rb
@@ -3,5 +3,11 @@
name { Faker::Company.name }
sequence(:slug) { |n| Faker::Internet.domain_word + n.to_s }
profile { association :organization_profile, organization: instance }
+
+ trait :with_page_text do
+ after(:create) do |organization|
+ create(:page_text, organization: organization) unless organization.page_text
+ end
+ end
end
end
diff --git a/test/factories/page_text.rb b/test/factories/page_text.rb
index 5b500e6fa..6fa2b3eb6 100644
--- a/test/factories/page_text.rb
+++ b/test/factories/page_text.rb
@@ -2,6 +2,17 @@
factory :page_text do
hero { "MyString" }
about { Faker::Lorem.sentence }
- organization { ActsAsTenant.current_tenant }
+ # organization { ActsAsTenant.current_tenant }
+ association :organization, factory: :organization
+
+ trait :with_image do
+ after(:create) do |page_text|
+ page_text.about_us_images.attach(
+ io: File.open(Rails.root.join("app", "assets", "images", "cat.jpeg")),
+ filename: "cat.jpeg",
+ content_type: "image/jpeg"
+ )
+ end
+ end
end
end
diff --git a/test/integration/adoption_application_reviews_test.rb b/test/integration/adoption_application_reviews_test.rb
index 2030b53dd..c55d15854 100644
--- a/test/integration/adoption_application_reviews_test.rb
+++ b/test/integration/adoption_application_reviews_test.rb
@@ -8,6 +8,9 @@ class AdoptionApplicationReviewsTest < ActionDispatch::IntegrationTest
@withdrawn_app = create(:adopter_application, :withdrawn)
@successful_applicant_app = create(:adopter_application, status: :successful_applicant)
@adoption_made_app = create(:adopter_application, status: :adoption_made)
+ @organization = create(:organization)
+ @page_text = create(:page_text, organization: @organization)
+ Current.organization = @organization
end
context "non-staff" do
diff --git a/test/system/login_test.rb b/test/system/login_test.rb
index d244fc018..c166f822b 100644
--- a/test/system/login_test.rb
+++ b/test/system/login_test.rb
@@ -4,6 +4,8 @@ class LoginTest < ApplicationSystemTestCase
setup do
@user = create(:staff)
@organization = @user.organization
+ @page_text = create(:page_text, :with_image, organization: @organization)
+ Current.organization = @organization
end
context "when logging in as a staff member" do
diff --git a/test/system/registration_test.rb b/test/system/registration_test.rb
index 3f83c5bb4..e8c27943f 100644
--- a/test/system/registration_test.rb
+++ b/test/system/registration_test.rb
@@ -4,6 +4,8 @@ class RegistrationTest < ApplicationSystemTestCase
setup do
@user = create(:staff)
@organization = @user.organization
+ @page_text = create(:page_text, :with_image, organization: @organization)
+ Current.organization = @organization
visit root_url
click_on "Log In"
diff --git a/test/system/users_test.rb b/test/system/users_test.rb
index a08139320..a56cba2fe 100644
--- a/test/system/users_test.rb
+++ b/test/system/users_test.rb
@@ -4,6 +4,8 @@ class UsersTest < ApplicationSystemTestCase
setup do
@user = create(:staff)
@organization = @user.organization
+ @page_text = create(:page_text, :with_image, organization: @organization, hero: "Where every paw finds a home")
+ Current.organization = @organization
end
test "user can log out" do