Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update travis ci build tag #32

Closed
wants to merge 3 commits into from
Closed

Update travis ci build tag #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8dfa56
Update travis ci build tag
NickSchimek Mar 6, 2019
dcd4e40
Update specs for failing views
NickSchimek Mar 6, 2019
352b5fd
Remove test for blank custom page
NickSchimek Mar 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions spec/features/emails_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion spec/features/notifications_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 1 addition & 19 deletions spec/features/site_customization/custom_pages_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -115,7 +97,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
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/email_digests_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down