mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-10-31 19:29:26 -04:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 90 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
61 Commits
Author SHA1 Message Date
Brenda Wallace 73f62d4983 Add API resources for photos, plantings, and seeds; update application configuration 
- Introduced `PhotoResource`, `PlantingResource`, and `SeedResource` to manage respective models.
- Updated application configuration to include API base URL.
- Modified production and test environments to set API base URL dynamically.
- Removed outdated JSONAPI resources initializers and patches.
- Refactored routes to use resourceful routing for API endpoints.
- Updated request specs to reflect changes in API responses and relationships.
- Added helper methods for generating related links in request specs.
 2026-10-24 18:19:11 +13:00
Daniel O'Connor f338274611 Rails 7.1 (#3590) 
* Rails 7.1

* Update application.rb

* Bump searchkick

* Bump to 7.0.0

* Fix

* Fix crop search

* Sync translation

* Drop required from form group

* Loosen specs further

* Fix Gemfile

* Update seeds_request_spec.rb

* Update test.rb

* Rename
 2024-01-27 10:06:47 +10:30
Daniel O'Connor 07feb1cd85 Drop tests 2022-12-10 15:54:58 +10:30
Brenda Wallace 9dbf8b7c8f New robocops 2020-08-26 12:36:58 +12:00
Brenda a4afeea025 Updated test stubs to support geocoder 1.6 
https://github.com/alexreisner/geocoder/issues/1258
 2020-06-20 10:57:03 +12:00
codefactor-io 4ff95fbac9 [CodeFactor] Apply fixes 2020-01-21 22:26:08 +13:00
Brenda 7257b2ada1 Update with frozen literals 2020-01-10 16:50:52 +13:00
Brenda Wallace 04fd1a343a Rubocop update (#2334) 
* Update rubocop config

* Rubocop update - for rubocop 0.77

* [CodeFactor] Apply fixes

* rubocop fixes

* [CodeFactor] Apply fixes to commit 2826c2e
 2019-12-16 22:35:33 +13:00
Brenda Wallace a43c235423 Upgrade to Rails 5.2 2019-01-01 10:31:53 +13:00
Brenda Wallace 3fec343f2c Rubocop for hash alignment 2018-12-30 15:13:59 +13:00
Brenda Wallace 8348530e22 Tell capybara to normalise whitespace 2018-12-30 12:58:22 +13:00
Brenda Wallace fa32537c3b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	.rubocop_todo.yml
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/members.js.erb
	app/assets/stylesheets/predictions.sass
	app/controllers/crops_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/plantings_controller.rb
	app/models/account.rb
	app/models/account_type.rb
	app/models/member.rb
	app/models/order.rb
	app/models/order_item.rb
	app/models/product.rb
	app/views/gardens/show.html.haml
	app/views/layouts/application.html.haml
	config/initializers/assets.rb
	config/routes.rb
	db/schema.rb
	package-lock.json
	spec/controllers/account_types_controller_spec.rb
	spec/controllers/admin/orders_controller_spec.rb
	spec/controllers/comments_controller_spec.rb
	spec/controllers/gardens_controller_spec.rb
	spec/controllers/harvests_controller_spec.rb
	spec/controllers/member_controller_spec.rb
	spec/controllers/order_items_controller_spec.rb
	spec/controllers/orders_controller_spec.rb
	spec/controllers/photo_associations_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/controllers/plantings_controller_spec.rb
	spec/controllers/seeds_controller_spec.rb
	spec/controllers/shop_controller_spec.rb
	spec/features/crops/crop_detail_page_spec.rb
	spec/models/member_spec.rb
	spec/models/post_spec.rb
	spec/views/crops/_planting_advice.html.haml_spec.rb
	spec/views/home/_crops.html.haml_spec.rb
	spec/views/orders/show.html.haml_spec.rb
	spec/views/posts/show.html.haml_spec.rb
	spec/views/shop/index_spec.rb
 2018-04-02 10:59:13 +12:00
Brenda Wallace aab91e2fa9 Removed active merchant 2018-02-09 10:53:05 +13:00
Brenda Wallace 65b4c7dbc1 Revert "Auto corrected by following Style/StringLiterals" 
This reverts commit ab56a3c6b3.
 2018-02-09 07:58:47 +13:00
Awesome Code ab56a3c6b3 Auto corrected by following Style/StringLiterals 2018-02-07 10:20:26 +13:00
Brenda Wallace f1c8743623 Config for rails 5 2018-01-03 17:10:50 +13:00
Miles Gould 9030e5b978 Merge branch 'dev' into test_runners 2017-02-16 13:31:39 +00:00
Brenda Wallace 2b03381a24 Removed trailing commas 2017-02-15 23:33:06 +00:00
Miles Gould f11bc42507 Turn on asset compilation in test 
This is required for running jasmine tests via `rake spec:javascript`.
The comment above this setting warned that it would slow down testing
considerably; in my quick tests the slowdown is only about 2% (3mins 14
vs 3mins 11). We precompile assets in Travis, so this *shouldn't* cause
any more random CI failures...
 2017-02-07 14:27:14 +00:00
Brenda Wallace 40a981c94d Removed unnecesary braces on hash args 2017-01-22 15:10:11 +13:00
Miles Gould 1841548936 Precompile assets in test 
According to
https://github.com/teampoltergeist/poltergeist/issues/677#issuecomment-222919584,
a possible cause of the "Request failed to reach server" problem (#901)
is that assets are being compiled on-demand, causing enough of a
slowdown for PhantomJS to think the connection has failed. This turns
off lazy asset compilation in the test environment and precompiles
assets before testing on Travis. We should also turn off lazy asset
compilation in production - see
http://stackoverflow.com/questions/8821864/config-assets-compile-true-in-rails-production-why-not
Our Heroku deployments already run `rake assets:precompile`.
 2016-11-30 11:01:25 +00:00
Brenda Wallace 723ebff923 Spacing fixes 2016-11-26 12:13:17 +13:00
Brenda Wallace 62e7c716dd Removed extra empty blank lines 2016-11-26 12:06:02 +13:00
Brenda Wallace 2e46cccd21 Hash alignment 2016-11-26 11:52:10 +13:00
Brenda Wallace 6bd9bd98d9 Removed extra blank lines, & added a end of file 2016-11-16 12:52:48 +13:00
Brenda Wallace bdb057ca0f Removed all trailing white space 2016-11-14 15:05:32 +13:00
Daniel O'Connor 43e7d6f7c2 Merge remote-tracking branch 'upstream/dev' into add_facebook_signup 2016-07-05 03:09:36 +09:30
Daniel O'Connor df9cf3f5c4 Fix various rails deprecations 2016-06-10 15:58:39 +09:30
pozorvlak e419acea6e Install BogusPayPalGateway gem 
We were maintaining a vendor fork of active_merchant because they
refused to merge this feature in; it's now been released as a
separate gem.
 2016-06-07 17:43:35 +00:00
Daniel O'Connor 083035c924 Merge branch 'dev' of github.com:Growstuff/growstuff into add_facebook_signup 2016-05-23 16:58:22 +09:30
Daniel O'Connor 4b4e0cf69a $ rubocop --only HashSyntax --auto-correct 
483 files inspected, 2018 offenses detected, 2018 offenses corrected
 2016-05-19 15:53:11 -04:00
Daniel O'Connor 00ca01dc33 Add coverage of the most basic scenarios around sign up and login 2015-09-15 11:20:33 +09:30
AELOGICA 429e54733d Moved the geocoder stub to ./cofig/environments/test.rb 2015-07-01 10:57:28 +08:00
Taylor Griffin 102763f2ab link to new crop request form 2015-02-10 22:12:22 +11:00
Taylor Griffin fb595de457 edited configuration and dependencies 2014-11-18 22:24:58 +11:00
Taylor Griffin acbd3f9a9e implement strong parameters instead of protected attributes 2014-11-18 20:08:54 +11:00
Taylor Griffin 98c1680138 handle misc deprications 2014-11-17 07:16:02 +11:00
Taylor Griffin 40a88b5b09 tests run but fail like whoa 2014-11-15 21:44:55 +11:00
Miles Gould 6921119301 Make Capybara actually hit the server. 
Background:
http://talk.growstuff.org/t/mysteriously-broken-feature-tests/120

@oshiho3's suggested fix didn't work, so I tried all the suggestions at
http://stackoverflow.com/questions/6536503/capybara-with-subdomains-default-host
until I found one that fixed the problem.
 2014-11-02 22:21:32 +00:00
Taylor Griffin 5df0c9c71a sketch feature test for planting a crop 2014-07-26 08:36:48 +10:00
Skud b489fda18e revert to devise 3.0.x due to confirmable misbehaviour 
as documented here: https://github.com/plataformatec/devise/issues/3009

also update mailer to use letter_opener and also localhost:8080 since
we're mostly using unicorn at this point.
 2014-05-01 22:48:52 +10:00
Skud 2cd5b1d2ed Changed one config setting (site name) over to figaro 
Also massively simplified the original application.yml.example I
originally committed. Let's do this one step at a time.
 2014-04-29 12:57:16 +10:00
Skud 3a162e9b31 Fixed broken tests for markdown filter 2013-11-08 12:55:47 +11:00
Miles Gould 4701bd1b2e Merge branch 'dev' into places2 
Conflicts:
	Gemfile.lock
	config/application.rb
	credentials.example
 2013-08-31 15:49:30 +01:00
Skud ffeda3007a added help text/links to planting form 2013-08-30 16:37:59 +10:00
Miles Gould c955504ad7 Reinstate Geocoder lookup 
Direct Nominatim lookups were playing badly with "nearby" method in
testing. The slowness is largely fixed in the HEAD revision of Geocoder.
 2013-08-28 12:00:58 +01:00
Miles Gould aa73a07e5f Add in_testing config option to Nominatum 
Checking against Rails.env.test? fails on Travis.
 2013-08-23 16:37:43 +01:00
Miles Gould 251a45a441 Add a User-Agent to Nominatum requests 
- unified repeated config into config/application.rb
 - removed superfluous calls to Growstuff::Application.config
 2013-08-23 14:03:46 +01:00
Miles Gould 7857bfd0df Merge branch 'dev' into places2 
Fix up broken indentation on navbar.
Conflicts:
	app/views/layouts/_header.html.haml
 2013-08-23 13:29:37 +01:00
Miles Gould 4e62991f22 Replace Geocoder lookups with direct calls to Nominatim. 
This is because Geocoder-via-Nominatim was really really slow (up to
10s).
 2013-08-23 13:11:02 +01:00