Commit Graph

493 Commits

Author SHA1 Message Date
Brenda Wallace
0a0cd24e2a Removed extra reindex 2019-04-13 10:06:44 +12:00
Brenda Wallace
9683983f23 Merge branch 'dev' into feature/searchkick 2019-04-10 20:02:35 +12:00
Brenda Wallace
7ac410c499 varieties info on crops#show (#1848)
* Tests for crop.photos
* More info on a crop's varieties, and parent
* Update spec for new crop varieties display
* Add varieties div wrapper, so test can find the area of the page
2019-04-10 20:02:05 +12:00
Brenda Wallace
5b35e3fe95 remove an unnecesary index 2019-04-08 21:39:20 +12:00
Brenda Wallace
01a3654d41 Working without elastic search too 2019-04-08 21:39:20 +12:00
Brenda Wallace
e5c0edb0d0 Tidy up specs 2019-04-08 21:39:20 +12:00
Brenda Wallace
bd797a4d8e Change call to reindex crops in specs 2019-04-08 21:39:20 +12:00
Awesome Code
a2fd0f0ae2 Auto corrected by following Lint Ruby RSpecEmptyLine 2019-04-01 10:15:18 +00:00
Brenda Wallace
6ef3b02764 Remove commented out code 2019-04-01 23:02:50 +13:00
Brenda Wallace
495002d8b9 Change "background" to "before" 2019-04-01 23:02:50 +13:00
Awesome Code
4ba5319ba8 Auto corrected by following Lint Ruby Capybara/FeatureMethods 2019-04-01 23:02:50 +13:00
Awesome Code
ad470ede1d Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace 2019-03-13 17:23:33 +13:00
Awesome Code
3bc1bba448 Auto corrected by following Lint Ruby RSpecEmptyLine 2019-03-12 22:51:12 +00:00
Awesome Code
f90cc792bb Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace 2019-03-13 11:42:27 +13:00
Brenda Wallace
0c868d3edb Merge branch 'dev' into photos/seeds 2019-02-16 12:37:53 +13:00
Brenda Wallace
d3a542727c Fixing crop deleting and adding tests 2019-02-15 08:45:18 +13:00
Brenda Wallace
3722672869 Merge branch 'dev' into photos/seeds 2019-02-13 09:06:42 +13:00
Brenda Wallace
c298a1763f Merge branch 'dev' into photos/seeds 2019-02-12 16:21:51 +13:00
Brenda Wallace
2f5de1f98e Merge branch 'dev' into garden-overview 2019-02-12 11:28:45 +13:00
Awesome Code
3efc0caaf7 Auto corrected by following Lint Ruby EmptyLine 2019-02-11 11:02:33 +13:00
Awesome Code
689baa85a3 Auto corrected by following Lint Ruby RSpec/ExampleWording 2019-02-11 10:17:54 +13:00
Awesome Code
490db7b342 Auto corrected by following Lint Ruby RSpec/HookArgument 2019-02-11 09:00:34 +13:00
Awesome Code
49eed9b208 Auto corrected by following Lint Ruby RSpec/LetBeforeExamples 2019-02-10 09:24:00 +00:00
Brenda Wallace
572af9d135 Merge branch 'dev' into photos/seeds 2019-02-09 17:00:58 +13:00
Brenda Wallace
9be4bf2685 Merge branch 'dev' into garden-overview 2019-02-09 17:00:07 +13:00
Awesome Code
284bb81bbf Auto corrected by following Lint Ruby RSpecEmptyLine 2019-02-09 03:05:40 +00:00
Brenda Wallace
95db0f7297 Shortened the text on the badges 2019-02-09 14:18:15 +13:00
Brenda Wallace
51e6da7da6 Rubocop lint tidxy 2019-02-05 12:37:23 +13:00
Brenda Wallace
49f7e57334 Make use of factory bot 2019-02-05 09:59:09 +13:00
Brenda Wallace
6be8f05223 Set the planted at date to the past (so we don't end up with 0%) 2019-02-04 22:11:50 +13:00
Brenda Wallace
1ead9e333b Fixed up planting_status when planting no planted yet 2019-02-04 21:55:23 +13:00
Brenda Wallace
862bdf35f5 Look for crop card on photo#show 2019-02-04 21:43:31 +13:00
Brenda Wallace
bb5a606240 Updated string to look for when planting 2019-02-04 21:43:10 +13:00
Brenda Wallace
b29c830f65 Merge branch 'dev' into photos/seeds 2019-02-04 21:17:08 +13:00
Brenda Wallace
a074810988 FEature specs for showing photos on crops#show 2019-02-04 21:03:31 +13:00
Brenda Wallace
41082b31a9 Merge branch 'dev' into fix/recent-harvests 2019-01-30 16:44:47 +13:00
Brenda Wallace
6acc6bd5ee Tell rspec which gardens button to use 2019-01-30 15:25:07 +13:00
Brenda Wallace
10beb65e1a Feature spec to check most recently planted/harvested on crops#show 2019-01-27 18:23:15 +13:00
Brenda Wallace
986bca44f7 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up
Conflicts:
	app/views/layouts/_header.html.haml
	spec/features/gardens/actions_spec.rb
2019-01-24 13:48:36 +13:00
Brenda Wallace
4e82584a0a Fixed label on link in spec 2019-01-24 12:17:40 +13:00
Brenda Wallace
a09c6603e2 Fixed photo specs to find the button on the actions view 2019-01-24 12:17:40 +13:00
Brenda Wallace
1460d4822a Crop name is in button label - add to spec 2019-01-24 12:17:40 +13:00
Brenda Wallace
28422bfd1d Seperate some specs 2019-01-24 12:17:40 +13:00
Brenda Wallace
81ee8ec56e Add crop name to actions 2019-01-24 12:17:40 +13:00
Brenda Wallace
99fb21eebe Find maze button in spec 2019-01-24 12:17:40 +13:00
Brenda Wallace
8ec35cc65c Action specs for someone else's garden 2019-01-24 12:17:40 +13:00
Brenda Wallace
e6e582cb4a Move some action button specs to feature specs
because it's in a buttonbar, not the view now
2019-01-24 12:17:40 +13:00
Brenda Wallace
8eb9487967 Move home page greeting test to features spec (from views) 2019-01-24 12:17:40 +13:00
Brenda Wallace
a8547d6033 Update labels on button in crop detail spec 2019-01-24 12:17:40 +13:00
Brenda Wallace
8df90dacfc Seperate specs 2019-01-24 12:17:40 +13:00