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

lat_lng search (now with tests) #171

Merged
merged 1 commit into from
Jun 12, 2014

Conversation

dana11235
Copy link
Contributor

I made sure that this passes all tests (at least for search - a bunch of the other tests are broken), and added some new tests.

Also, renamed the parameter to lat_lng from geo, which I agree makes more sense.

@@ -99,6 +99,7 @@
it 'returns no results' do
create(:farmers_market_loc)
get 'api/search?location=00000'
puts json
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this line (puts json).

@monfresh
Copy link
Member

Thanks, Dana. It looks much better now. There are just a few minor style issues. If you could please fix them, we'll be good to go. See my inline comments.

Also, note that you don't have to create a whole new pull request to make these changes. You can just push your new changes to the same branch. If you know how to rebase, that would be ideal so that your commits are squashed into a single one with a more accurate commit message that references the lat_lng parameter instead of the geo parameter. Let me know if you need me to post rebase instructions.

@dana11235
Copy link
Contributor Author

The only reason I created a new branch was because I wanted to merge in your recent changes, and the rebase didn't go smoothly. So it was easier to just pull your master and then re-cherry-pick the changelist.

I made the changes you suggested, and squashed it down to a single commit via rebase. I had to force the push since the changes were already on the remote branch.

@monfresh
Copy link
Member

Gotcha. Thanks for the changes! You're right about having different expectation syntax in our specs. I'm actually working on fixing that right now. There's a gem that will do it for you: https://github.com/yujinakayama/transpec

monfresh added a commit that referenced this pull request Jun 12, 2014
lat_lng search (now with tests)
@monfresh monfresh merged commit 3b31d4c into codeforamerica:master Jun 12, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants