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.

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

Release 1.10.0 #408

Merged
merged 14 commits into from
Dec 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
### 2 Install Vagrant.
https://www.vagrantup.com/downloads.html

### 3 Capture the powers of vagrant
### 3 Install VirtualBox
https://www.virtualbox.org/wiki/Downloads

### 4 Capture the powers of vagrant
* In the repo dir: <code>vagrant up</code> (Safely ignore: 'dpkg-preconfigure: unable to re-open stdin: No such file or directory')
* If changes have been made since running vagrant up: <code>vagrant provision</code>

Expand All @@ -25,10 +28,10 @@ https://www.vagrantup.com/downloads.html

[1] You can run any command locally using `rake vagrant:shell[]` and it will be executed in the repo root of the vagrant machine. You can try `rake vagrant:shell['pwd']` and see it will print the directory that the repo is in on the vagrant machine!

### 4 Optional tasks:
### 5 Optional tasks:
run <code>rake db:fix_accents</code> to clean up encoding problems in the safe2pee data. (Use <code>rake db:fix_accents[dry_run]</code> to preview the changes.)

### 5 Assets
### 6 Assets
* [Assets Repo](https://github.com/RefugeRestrooms/refuge_assets)

## Testing
Expand Down
Binary file added app/assets/images/patreon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/views/layouts/_footer.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@
refuge restrooms is open source.
%a{:href => "https://github.com/RefugeRestrooms/refugerestrooms"} code on github.
%br/
contribute to the project
%a{:href => "https://patreon.com/refugerestrooms"} on patreon.
%br/
= "\&copy; copyleft #{Date.today.year} refuge restrooms.".html_safe
4 changes: 2 additions & 2 deletions app/views/layouts/_search.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
.input-group
= text_field_tag :search, params[:search], class: "form-control search-bar", aria: {label: t("search_bar.enter_location")}
.input-group-btn
%button.btn.btn-light-purple.submit-search-button{type: "button", title: "Search", value: "Search"}
%button.btn.btn-light-purple.submit-search-button{type: "button", title: "Search", value: "Search", aria: { label: "Search" }}
%i.fa.fa-search.fa-2x
%i.fa.fa-refresh.fa-spin.fa-2x
%button.btn.btn-light-purple.current-location-button{type: "button", title: "Search by Current Location", value: (splash ? "Search Current Location" : nil ) }
%button.btn.btn-light-purple.current-location-button{type: "button", title: "Search by Current Location", aria: { label: "Search by Current Location" }, value: (splash ? "Search Current Location" : nil ) }
%i.fa.fa-location-arrow.fa-2x
%i.fa.fa-refresh.fa-spin.fa-2x
7 changes: 4 additions & 3 deletions app/views/pages/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@
= button_to new_restroom_path, method: :get, class: "btn btn-lg btn-purple splash-add-restroom-btn" do
Add A Restroom
%i.fa.fa-plus-square-o.fa-2x

.row.even-more-headroom
.col-xs-12.col-sm-6.col-sm-offset-3
.col-xs-6.col-sm-3.col-sm-offset-3
= link_to image_tag("app-store.svg", role: "img"), "https://itunes.apple.com/us/app/refuge-restrooms/id968531953?mt=8"
.col-xs-6.col-sm-3
= link_to image_tag("play-store.png"), "https://play.google.com/store/apps/details?id=org.refugerestrooms"

.row.more-headroom.splash-bottom-padding
.col-xs-12.col-sm-6.col-sm-offset-3
= link_to image_tag("play-store.png"), "https://play.google.com/store/apps/details?id=org.refugerestrooms"
= link_to image_tag("patreon.png"), "https://patreon.com/refugerestrooms"
= render 'layouts/footer'
5 changes: 5 additions & 0 deletions features/search.feature
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,14 @@ Feature: Search for restrooms
And I search from Vancouver
Then I should not see a restroom

Scenario: Search from splash page (screen reader accessibility check)
When I am on the splash page
Then the search buttons should have ARIA labels

Scenario: Map display
Given a restroom exists in Winnipeg
When I am on the splash page
And I search from Winnipeg
And I show the map
Then I should see a restroom on the map

5 changes: 5 additions & 0 deletions features/step_definitions/search_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@
mock_location location
find('.current-location-button').click
end

Then(/^the search buttons should have ARIA labels$/) do
expect(find('button.submit-search-button')['aria-label']).to be_truthy
expect(find('button.current-location-button')['aria-label']).to be_truthy
end