Commit Graph
479 Commits
Author SHA1 Message Date
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
Brenda Wallace 6ced6c5c4e Update link label in spec 2019-01-24 12:17:40 +13:00
Brenda Wallace 106497c841 Rubocop fix ups 2019-01-06 08:45:42 +13:00
Brenda Wallace f638b9a5da Update path to member gardens in spec 2019-01-06 08:45:42 +13:00
Brenda Wallace f008270ba2 Update spec for finding your own seeds 2019-01-06 08:45:42 +13:00
Brenda Wallace 686b7f27d0 Fixed paths in gardens feature spec 2019-01-06 08:45:42 +13:00
Brenda Wallace dcbfc4f9fa Fixed spec to look for new DRY header template in gardens 2019-01-06 08:45:42 +13:00
Brenda Wallace b44b7fdd2e Move follows from members controller to follows controller 2019-01-06 08:45:42 +13:00
Brenda Wallace 1e266a92f6 Members slug used in rotes 2019-01-06 08:45:42 +13:00
Brenda Wallace 387200abf7 Moving garden data under members 2019-01-06 08:45:42 +13:00
Brenda Wallace 68953188f8 Update to new path names 2019-01-06 08:45:42 +13:00
Brenda Wallace ac660e986c Wrap all action bar button groups in a div
So we can find them in specs
2018-12-30 16:14:00 +13:00
Brenda Wallace 7b01fcbd4b Align all the hashes 2018-12-30 15:22:29 +13:00
Brenda Wallace ac6a308ea0 Update URL -> CGI 2018-12-30 15:05:41 +13:00
Brenda Wallace 0c78791d01 Remove unnecesary whitesapce in specs 2018-12-30 13:22:42 +13:00