Commit Graph
1870 Commits
Author SHA1 Message Date
Brenda Wallace 1eea251f95 Merge branch 'dev' into plantings-show 2019-04-19 10:39:26 +12:00
Brenda Wallace 32a88b4482 Merge remote-tracking branch 'origin/plantings-show' into plantings-show 2019-04-19 09:16:01 +12:00
Brenda Wallace a2e2362594 Linter fix ups 2019-04-19 09:15:41 +12:00
Brenda Wallace 6af61d0e86 Add someone else's plantings, to ensure test is valid 2019-04-19 09:11:56 +12:00
Brenda Wallace 909ce99ab8 Merge remote-tracking branch 'origin/feature/searchkick' into feature/searchkick 2019-04-19 09:06:55 +12:00
Brenda Wallace 3829db6bc2 Specs for biasing results from elastic search 2019-04-19 09:05:53 +12:00
pozorvlakandBr3nda b3385663e8 Fix spelling of portobello
Co-Authored-By: Br3nda <brenda@wallace.net.nz>
2019-04-19 08:47:08 +12:00
Daniel O'Connor 8a14a7bc0d Merge branch 'dev' into plantings-show 2019-04-18 17:33:30 +09:30
Brenda Wallace 85ba701045 Merge branch 'dev' into feature/searchkick 2019-04-17 12:35:09 +12:00
Awesome Code 8b0ecd568e Auto corrected by following Lint Ruby RSpec/ImplicitSubject 2019-04-17 10:37:30 +12:00
Awesome Code d0001691d5 Auto corrected by following Lint Ruby EmptyLine 2019-04-16 22:02:27 +12:00
Awesome Code a4e398bb62 Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace 2019-04-16 09:55:51 +00:00
Awesome Code b9ca89b336 Auto corrected by following Lint Ruby RSpec/LetBeforeExamples 2019-04-14 19:38:16 +00:00
Awesome Code ff3ea5c52f Auto corrected by following Lint Ruby RSpec/HookArgument 2019-04-14 18:38:06 +00:00
Awesome Code b84b1e89c1 Auto corrected by following Lint Ruby RSpec/ExampleWording 2019-04-14 18:37:52 +00:00
Awesome Code e54c13afe3 Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace 2019-04-14 18:36:34 +00:00
Awesome Code 50a2de3709 Auto corrected by following Lint Ruby RSpecEmptyLine 2019-04-14 10:01:46 +00:00
Brenda Wallace 0ae33d9b03 Merge branch 'dev' into plantings-show 2019-04-13 21:02:56 +12:00
Brenda Wallace cb680a5a0e Auto corrected by following Lint Ruby Space (#1917) 2019-04-13 12:09:47 +12:00
Brenda Wallace e34a2d609b Plurals spec only when we have elastic search 2019-04-13 10:17:21 +12:00
Brenda Wallace 0a0cd24e2a Removed extra reindex 2019-04-13 10:06:44 +12:00
Brenda Wallace 347d751935 More plurals and misspellings in search specs 2019-04-13 10:03:18 +12:00
Brenda Wallace 026efe5d15 Rubocop lint 2019-04-13 09:50:49 +12:00
Brenda Wallace 3ecb81300a Re-index before we use autocomplete
so elastic search is in sync
2019-04-13 09:42:13 +12:00
Brenda Wallace 526450f0eb Added search controller specs 2019-04-13 09:42:13 +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 55e89e95fe Fix a deprecation warning 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 77d1fc7347 Move crop searching specs from the crop model to the crop search service 2019-04-08 21:39:20 +12:00
Brenda Wallace e5c0edb0d0 Tidy up specs 2019-04-08 21:39:20 +12:00
Brenda Wallace e465b6f19c Elastic search spec helper 2019-04-08 21:39:20 +12:00
Brenda Wallace ab57451b17 only reindex our one crop 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
Brenda Wallace 370747390a Add default pagination to crop search service 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
Brenda Wallace a62c268dda Merge branch 'dev' into plantings-show 2019-03-31 10:20:57 +13:00
Awesome Code 6e10dc2a2b Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace 2019-03-31 10:20:08 +13:00
Awesome Code 4dcb420534 Auto corrected by following Lint Ruby RSpec/HookArgument 2019-03-31 10:19:51 +13:00
Awesome Code fb243c1f8d Auto corrected by following Lint Ruby RSpec/ExpectChange 2019-03-31 09:24:13 +13:00
Awesome Code 837ae8cb8e Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace 2019-03-30 18:09:37 +13:00
Awesome Code f48e131e14 Auto corrected by following Lint Ruby RSpecEmptyLine 2019-03-30 18:07:30 +13:00
Brenda Wallace 6cf60afec4 Don't check for markasinished on plantings#index 2019-03-29 15:49:11 +13:00
Brenda Wallace 43bb606a2b Cleaning up small screen presentation 2019-03-29 15:48:47 +13:00
Brenda Wallace 830b554dc9 Test updates 2019-03-29 11:28:17 +13:00
Brenda Wallace e4d4cdc3fa Fix up seed description helper 2019-03-29 10:45:51 +13:00