From a8dfa56150b14ca481bd0fe405cf5e3f21dba669 Mon Sep 17 00:00:00 2001 From: Nick Schimek Date: Wed, 6 Mar 2019 08:33:39 -0800 Subject: [PATCH 1/3] Update travis ci build tag Configured travis ci and hound bot on github Updated the travis ci build tag to point to code-for-portland's consul build. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 95d9fa89c..f6391311d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Citizen Participation and Open Government Application -[![Build Status](https://travis-ci.org/consul/consul.svg?branch=master)](https://travis-ci.org/consul/consul) +[![Build Status](https://travis-ci.org/CodeForPortland/portlandconsul.svg?branch=master)](https://travis-ci.org/CodeForPortland/portlandconsul) [![Code Climate](https://codeclimate.com/github/consul/consul/badges/gpa.svg)](https://codeclimate.com/github/consul/consul) [![Coverage Status](https://coveralls.io/repos/github/consul/consul/badge.svg)](https://coveralls.io/github/consul/consul?branch=master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/consul/localized.svg)](https://crowdin.com/project/consul) From dcd4e40279b92564839bedf913d09db7cfa95c77 Mon Sep 17 00:00:00 2001 From: Nick Schimek Date: Wed, 6 Mar 2019 11:32:50 -0800 Subject: [PATCH 2/3] Update specs for failing views --- spec/features/emails_spec.rb | 4 ++-- spec/features/notifications_spec.rb | 2 +- spec/features/site_customization/custom_pages_spec.rb | 2 +- spec/lib/email_digests_spec.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index 09b6130d6..4312f07e1 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -286,7 +286,7 @@ email_digest.mark_as_emailed email = open_last_email - expect(email).to have_subject("Proposal notifications in CONSUL") + expect(email).to have_subject("Proposal notifications in Portland Clean Energy Fund") expect(email).to deliver_to(user.email) expect(email).to have_body_text(proposal1.title) @@ -353,7 +353,7 @@ expect(unread_emails_for("isable@example.com").count).to eq 1 email = open_last_email - expect(email).to have_subject("Invitation to CONSUL") + expect(email).to have_subject("Invitation to Portland Clean Energy Fund") expect(email).to have_body_text(/#{new_user_registration_path}/) end diff --git a/spec/features/notifications_spec.rb b/spec/features/notifications_spec.rb index d492f1f07..793513f35 100644 --- a/spec/features/notifications_spec.rb +++ b/spec/features/notifications_spec.rb @@ -205,7 +205,7 @@ Notification.send_pending email = open_last_email - expect(email).to have_subject("Proposal notifications in CONSUL") + expect(email).to have_subject("Proposal notifications in Portland Clean Energy Fund") end it "sends emails in batches" do diff --git a/spec/features/site_customization/custom_pages_spec.rb b/spec/features/site_customization/custom_pages_spec.rb index 662388ef2..cca8a1b1e 100644 --- a/spec/features/site_customization/custom_pages_spec.rb +++ b/spec/features/site_customization/custom_pages_spec.rb @@ -115,7 +115,7 @@ visit help_path - expect(page).to have_content("Another custom page") + expect(page).to have_content("Portland Clean Energy Fund Language") end scenario "Not listed in more information page" do diff --git a/spec/lib/email_digests_spec.rb b/spec/lib/email_digests_spec.rb index c5477610d..a3540b528 100644 --- a/spec/lib/email_digests_spec.rb +++ b/spec/lib/email_digests_spec.rb @@ -78,7 +78,7 @@ email_digest.deliver(Time.current) email = open_last_email - expect(email).to have_subject("Proposal notifications in CONSUL") + expect(email).to have_subject("Proposal notifications in Portland Clean Energy Fund") end it "does not deliver email if no notifications pending" do From 352b5fd1dca3ee329af33313534472656a28198b Mon Sep 17 00:00:00 2001 From: Nick Schimek Date: Wed, 6 Mar 2019 11:33:30 -0800 Subject: [PATCH 3/3] Remove test for blank custom page This page is being used. --- .../site_customization/custom_pages_spec.rb | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/spec/features/site_customization/custom_pages_spec.rb b/spec/features/site_customization/custom_pages_spec.rb index cca8a1b1e..cee2740d4 100644 --- a/spec/features/site_customization/custom_pages_spec.rb +++ b/spec/features/site_customization/custom_pages_spec.rb @@ -87,24 +87,6 @@ expect(page).to have_content("Print this info") end - scenario "Don't show subtitle if its blank" do - custom_page = create(:site_customization_page, :published, - slug: "slug-without-subtitle", - title_en: "Custom page", - subtitle_en: "", - content_en: "Text for new custom page", - print_content_flag: false - ) - - visit custom_page.url - - expect(page).to have_title("Custom page") - expect(page).to have_selector("h1", text: "Custom page") - expect(page).to have_content("Text for new custom page") - expect(page).not_to have_selector("h2") - expect(page).not_to have_content("Print this info") - end - scenario "Listed in more information page" do custom_page = create(:site_customization_page, :published, slug: "another-slug",