Commit Graph

783 Commits

Author SHA1 Message Date
Awesome Code
8c8d549cb1 Auto corrected by following RSpec/NotToNot 2018-01-23 09:00:34 +13:00
Awesome Code
d9cc1dcae8 Auto corrected by following RSpec/MultipleSubjects 2018-01-23 09:00:34 +13:00
Awesome Code
dea7ce241b Auto corrected by following RSpec/EmptyLineAfterFinalLet 2018-01-23 09:00:34 +13:00
Brenda Wallace
49253b59ee Fixing up prediction specs 2018-01-23 09:00:34 +13:00
Brenda Wallace
427a0187e1 updated prediction spec 2018-01-23 09:00:34 +13:00
Brenda Wallace
d9bdc46099 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
Conflicts:
	app/assets/javascripts/members.js.erb
2018-01-21 21:20:43 +13:00
Daniel O'Connor
a53fa7781c Merge branch 'dev' into awesomecode-rspec/multiplesubjects-7391 2018-01-18 14:07:34 +10:30
Shiny
4f0c004e50 Update crop_detail_page_spec.rb 2018-01-14 12:04:32 +13:00
Awesome Code
273e4c07d8 Auto corrected by following RSpec/NotToNot 2018-01-13 22:49:49 +00:00
Awesome Code
b6aef19be6 Auto corrected by following RSpec/MultipleSubjects 2018-01-13 22:49:36 +00:00
Brenda Wallace
8e0b7d9ded Merge branch 'charts' into upgrade/rails-5
Conflicts:
	app/assets/javascripts/crops.js.erb
	spec/controllers/comments_controller_spec.rb
	spec/controllers/harvests_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/controllers/plantings_controller_spec.rb
	spec/models/post_spec.rb
	spec/views/home/_crops.html.haml_spec.rb
2018-01-11 08:34:20 +13:00
Shiny
34715b5a2a Merge branch 'dev' into charts 2018-01-10 16:37:32 +13:00
Brenda Wallace
6d56f3f655 Merge branch 'charts' into upgrade/rails-5
Conflicts:
	app/views/layouts/application.html.haml
2018-01-09 15:55:28 +13:00
Awesome Code
e46f530dc3 Auto corrected by following RSpec/EmptyLineAfterFinalLet 2018-01-09 02:00:40 +00:00
Brenda Wallace
a2e4863f00 Fixing up prediction specs 2018-01-09 14:37:21 +13:00
Brenda Wallace
2c3fe3c204 updated prediction spec 2018-01-09 13:18:58 +13:00
Brenda Wallace
865fe106ad Unique member name on notifications spec 2018-01-07 22:10:27 +13:00
Brenda Wallace
386dc5ad7f Use factory bot in specs 2018-01-07 19:37:03 +13:00
Brenda Wallace
8e59e68dd7 Add valid DNS entry to feature spec, so it doesn't fail 2018-01-07 19:30:52 +13:00
Brenda Wallace
9e5aba75d8 Added full path to jpeg in spec, so does'nt throw asset pipeline errors 2018-01-07 18:35:28 +13:00
Brenda Wallace
99828c7c01 Updated spec for new admin#index 2017-12-17 17:54:13 +13:00
Brenda Wallace
3aa2f0bd3b Paginate photos on seeds#show (inc feature specs) 2017-12-17 08:55:08 +13:00
Brenda Wallace
14551b6ec8 Merge remote-tracking branch 'upstream/dev' into feature/photos-1457
Conflicts:
	spec/models/crop_spec.rb
2017-12-09 20:59:20 +13:00
Brenda Wallace
3cc637017d Avoid {} for multiline 2017-12-06 14:29:21 +13:00
Brenda Wallace
515325c44e Fixed up % delimiters 2017-12-06 14:14:31 +13:00
Brenda Wallace
ccbdfe51f6 Modified a spec to avoid a chicken and an egg 2017-11-29 22:30:11 +13:00
Brenda Wallace
6ed7376c58 Name garden in spec to ensure it's ordered first 2017-11-29 20:59:37 +13:00
Brenda Wallace
c8a200bf19 Changed selector in view spec
it was having trouble finding the link
2017-11-29 20:59:37 +13:00
Brenda Wallace
bd063be3a9 Fix gardens actions, and add specs
A bug slipped into all garden display pages - and there were no tests that caught it.
This adds feature specs for gardens#index, which would have detected the un-initialised
variable in haml
2017-11-19 16:31:17 +13:00
Logan Gingerich
ede5187369 Whitespace fix, spec fix, and spec addition 2017-11-19 11:13:41 +13:00
Brenda Wallace
dafaffcd73 Path remains same after sign out for our test cases 2017-11-18 22:25:58 +13:00
Brenda Wallace
3e149a5d1d Feature spec for showing item details on photo adding page 2017-11-18 22:25:58 +13:00
Brenda Wallace
c20d9b78c5 Reduced the tests of signout on photos/new 2017-11-18 22:25:58 +13:00
Brenda Wallace
3969f410f1 Tidy up photos logic, and test of signin/out on photos#new 2017-11-18 22:25:58 +13:00
Brenda Wallace
67dec795a0 Reinstated test of first harvest prediction display 2017-11-17 21:50:59 +13:00
Brenda Wallace
8884056ff3 Run existing crop specs with annual crop 2017-11-17 21:50:59 +13:00
Brenda Wallace
2fbba52bc8 Updating specs to use same owner for garden and planting 2017-11-13 19:18:14 +13:00
Brenda Wallace
7206f99510 Updated spec to match new crop detail page text 2017-11-07 08:39:45 +13:00
Brenda Wallace
6bf87c243c Feature spec for crop predictions on crop#show 2017-11-06 22:38:48 +13:00
Brenda Wallace
ec00baef0d Updated feature spec to look for new annual/perennial text 2017-11-05 14:07:33 +13:00
Brenda Wallace
5e5773aa59 feature spec for displaying annual/perennial on crops#show 2017-11-05 12:52:02 +13:00
Brenda Wallace
20fe9e4cc5 Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions 2017-11-04 10:09:53 +13:00
Logan Gingerich
10a8df47a9 Factorygirl to factorybot - fixes #1413 (#1425)
* FactoryGirl Changed to FactoryBot

file fix

changes based on comments received

Bundle Update on 2017-10-29

style update to align hash literal

added package-lock

* indentation fixes with rubocop

* name added to contributors
2017-11-01 15:03:31 +00:00
Brenda Wallace
251f44b0c7 Updated tests of progress bar 2017-11-01 13:57:49 +13:00
Brenda Wallace
adf07ce5ef Planting feature specs passing 2017-11-01 13:57:49 +13:00
Brenda Wallace
ff446c2139 Updated spec, new message when not enough data to predict progress 2017-11-01 13:57:49 +13:00
Brenda Wallace
e42ec4f8ae Test crop photo display when not signed in 2017-10-27 23:43:23 +13:00
Brenda Wallace
f7b75157e7 Feature spec for harvest photos 2017-10-27 23:34:37 +13:00
Brenda Wallace
7e27b6deef Merge branch 'feature/more-crop-photos' of github.com:Br3nda/growstuff into feature/more-crop-photos 2017-10-27 23:33:01 +13:00
Brenda Wallace
97c7277a73 fixed up ambigous regex and use of expect in specs 2017-10-23 10:44:37 +01:00