Commit Graph

213 Commits

Author SHA1 Message Date
Brenda Wallace
92195d51d2 Removed redundant returns 2016-12-04 21:21:35 +00:00
Brenda Wallace
178c181cf5 Merge remote-tracking branch 'upstream/dev' into bw/useless-assignments
Conflicts:
	app/controllers/crops_controller.rb
	app/models/crop.rb
	spec/models/scientific_name_spec.rb
2016-11-30 10:32:02 +13:00
Mackenzie Morgan
832719b01a merge from upstream dev 2016-11-29 09:37:25 -05:00
Mackenzie Morgan
e1a2b168c9 rename scientific_names.scientific_name to scientific_names.name
this mirrors alternate_names.name and allows making code more DRY
2016-11-28 21:57:51 -05:00
Brenda Wallace
8c7fcd9d49 Fixed all useless assignments 2016-11-26 19:36:59 +13:00
Brenda Wallace
bcdd2a9167 Changed called to rails dynamic find_by 2016-11-26 15:55:38 +13: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
83392ddda1 Indentation clean ups 2016-11-26 10:51:54 +13:00
Brenda Wallace
dac2343b68 Further code duplication reduction 2016-11-20 21:18:07 +13:00
Brenda Wallace
f24e02fd11 reduced code duplication again in photos cont spec 2016-11-20 21:13:57 +13:00
Brenda Wallace
dddc7b020d Corrected description in spec 2016-11-20 21:13:33 +13:00
Brenda Wallace
12a9a0b97d one more check no alert was generated 2016-11-20 21:13:08 +13:00
Brenda Wallace
6a8f48693b Reduce code duplication in photos cont spec 2016-11-20 21:12:43 +13:00
Brenda Wallace
50a0668c1d Check no alert message was generated 2016-11-20 21:11:54 +13:00
Brenda Wallace
a7e88a55b3 Spec for trying to attach photo when not allowed. 2016-11-20 21:03:08 +13:00
Brenda Wallace
d0a1a113b6 Multi-line block changed from {} to do end 2016-11-20 20:29:01 +13:00
Brenda Wallace
a8bffd3bce White space fix in spec 2016-11-20 20:28:34 +13:00
Brenda Wallace
f6aac07c3d Flatten params passed in photos controller spec 2016-11-20 20:27:59 +13:00
Brenda Wallace
72f1d83af4 Removed a bunch of blank lines 2016-11-20 20:19:14 +13:00
Brenda Wallace
bdb057ca0f Removed all trailing white space 2016-11-14 15:05:32 +13:00
Daniel O'Connor
29765ebc19 rubocop --only HashSyntax --auto-correct 2016-08-22 19:02:27 +09:30
Daniel O'Connor
18cd8f5966 #507 #813 Add spec 2016-05-19 15:53:11 -04:00
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
Cesy
01b9e76814 Merge pull request #860 from CloCkWeRX/fix_warnings
Fix WARNING: Using the `raise_error` matcher without providing a specific error
2016-04-09 13:26:11 +01:00
Daniel O'Connor
a3ad9189b1 Fix WARNING: Using the raise_error matcher without providing a specific error or message risks false positives, since raise_error will match when Ruby raises a NoMethodError, NameError or ArgumentError, potentially allowing the expectation to pass without even executing the method you are intending to call. Actual error raised was #<ActiveRecord::RecordNotFound: Couldn't find Member with 'id'=9999>. Instead consider providing a specific error class or message. This message can be supressed by setting: RSpec::Expectations.configuration.warn_about_potential_false_positives = false. Called from /home/travis/build/Growstuff/growstuff/spec/controllers/member_controller_spec.rb:65:in `block (3 levels) in <top (required)>'. 2016-04-07 10:41:35 +09:30
Daniel O'Connor
c3a883de16 Ensure we choose a plant part 2016-04-07 09:47:53 +09:30
Miles Gould
96b0198d41 Replace remaining calls to count() with size()
The couple that aren't removed are required: for instance, there's a
Crop.count method, but no Crop.size method.
2015-07-23 23:05:39 +01:00
Andrey
ad5730a81c Removed excessive example from notification controller specs 2015-05-27 12:08:30 +10:00
Skud
f830ed1cf2 Merge pull request #706 from tygriffin/deprecated-test-warning
add deprecation notice to all controller and view specs
2015-05-20 10:17:15 +10:00
Jake Yesbeck
c1ab161b89 Added self to Contributors.md per guidelines 2015-05-05 09:18:32 -07:00
Jake Yesbeck
46ac06698a Additional test for nonsense subdomain 2015-05-05 09:02:42 -07:00
Jake Yesbeck
0f8d1e7db1 Change the render to render the file directly
Also assert that the response is the actual file contents
instead of mocking the method call
2015-05-04 23:37:40 -07:00
Jake Yesbeck
507e5a0ebc Robots controller and custom robots.txt files
New route to /robots.txt and some specific logic to switch
on if the subdomain is staging or not.

Staging will not allow any crawlers at all, production does not
have any current limitations
2015-05-04 23:11:41 -07:00
Taylor Griffin
95974ab21b add deprecation not to all controller and view specs 2015-02-12 19:52:53 +11:00
Taylor Griffin
2f67ffd2f8 fix regressions 2015-02-02 00:01:49 +11:00
Mackenzie Morgan
0da121a48d adding test for harvest csv 2015-01-29 22:27:09 -05:00
Mackenzie Morgan
c38dc4661d basics of garden photos 2015-01-27 00:54:05 -05:00
Taylor Griffin
acbd3f9a9e implement strong parameters instead of protected attributes 2014-11-18 20:08:54 +11:00
Taylor Griffin
7fc886f43c implement custom Sweeper class as stop gap against errors when running specs 2014-11-16 12:01:27 +11:00
Skud
dc1afb8913 Added seeds_by_crop_path routes and stuff 2014-10-19 14:25:47 +01:00
Shiho Takagi
6e02f40e0a merging from dev 2014-10-05 13:47:12 +11:00
Shiho Takagi
14d039ee01 Added crops-posts association as well as updated GUI for crop show 2014-10-05 13:32:08 +11:00
Mackenzie Morgan
ed537e583b whitespace fixes and um oops no there shouldn't be a secret key in that config file 2014-09-09 20:31:14 -04:00
Mackenzie Morgan
7d54ab347f Adding photo functionality to harvests 2014-09-09 19:55:40 -04:00
Marlena Compton
ec25f2ab91 created list of crop wranglers on the crop wranglers page 2014-08-21 20:11:10 -07:00
Skud
1c34d428f2 Merge branch 'crop-search' of https://github.com/Skud/growstuff into Skud-crop-search
Conflicts:
	spec/models/crop_spec.rb
2014-04-29 11:16:20 +10:00
Skud
0a3ecdc5ad Added crop search controller and views 2014-01-03 22:29:44 +11:00
Skud
435cb4aed9 remove annoying scaffold-generated tests 2013-11-06 10:39:19 +11:00
Miles Gould
e9a3c0f4ee rails g scaffold PlantPart...
Also migration to remove the string plant_part.
2013-10-30 23:32:20 +00:00