mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-01-31 20:51:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,243 Commits 62 Branches 76 Tags
release47
Commit Graph

1586 Commits

Author SHA1 Message Date
Awesome Code
90f4db4853 Auto corrected by following Ruby rspec layout 2018-09-10 22:20:12 +00:00
Awesome Code
31744491ea Auto corrected by following Ruby FactoryBot/AttributeDefinedStatically 2018-09-09 21:53:57 +00:00
Brenda Wallace
f69f0861d2 Style fix up 2018-09-09 10:04:02 +12:00
brenda
2b8aac19dd Revert "Auto corrected by following Ruby Capybara/FeatureMethods" 
This reverts commit b52763b7c2.
 2018-09-07 10:40:09 +12:00
Awesome Code
b52763b7c2 Auto corrected by following Ruby Capybara/FeatureMethods 2018-09-05 12:06:58 +00:00
Awesome Code
345fac4358 Auto corrected by following Ruby FactoryBot/StaticAttributeDefinedDynamically 2018-07-21 04:04:00 +00:00
Brenda Wallace
77d2dc6144 Merge branch 'dev' into issue-565-create-harvests-rss 2018-06-17 20:58:32 +12:00
robotscissors
82b83ca7a4 Fix linter issues 2018-06-12 10:00:45 -07:00
robotscissors
e784790e19 add .to_s to accomodate hound 2018-06-11 11:16:47 -07:00
robotscissors
f9bdae77d3 add tests for harvests/index.rss 2018-06-11 10:38:26 -07:00
robotscissors
dff6827761 create rss feed for harvests 2018-06-10 20:38:43 -07:00
Brenda Wallace
d7e71c8fc3 Use factory bot to make a harvest.plant_part 2018-06-07 11:46:29 +12:00
Brenda Wallace
47ddc915ef Generate random number in plant_part.name in factorybot 2018-06-07 11:44:29 +12:00
Brenda Wallace
0d303ee6df Don't allow duplicate plant parts names 
Make factort's plant_part.name unique
Setting plant_part.name in specs
Unique names for plant parts
 2018-06-04 17:42:41 +12:00
Daniel O'Connor
a772bdaa8d Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-05-10 21:35:39 +09:30
Brenda Wallace
7a1499d854 Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-05-01 13:47:44 +12:00
Brenda Wallace
152cdace75 Removed spec for currency helpers 2018-05-01 13:47:25 +12:00
Brenda Wallace
db0c60be0d Rename zombie to super_late 2018-04-23 13:33:38 +12:00
Brenda Wallace
91e851c802 Merge remote-tracking branch 'upstream/dev' into feature/status 2018-04-23 13:00:53 +12:00
jenkr55
eed0b257fa Fixing test because I removed this line 2018-04-21 22:03:31 -05:00
Brenda Wallace
6677f8641f If not crop lifespan data, use parent data 2018-04-21 17:40:22 +12:00
Brenda Wallace
e5cf8b6091 added spec for finished_predicted_at 2018-04-21 17:25:04 +12:00
Brenda Wallace
6077d4da34 Fixed bug in garden spec 2018-04-21 15:01:33 +12:00
Brenda Wallace
34b6b54616 Name goes on garden, not planting 2018-04-21 14:33:39 +12:00
Brenda Wallace
5cc647ee9b test that expects a garden name, set to that name 2018-04-21 14:22:20 +12:00
Brenda Wallace
948c32d1d5 test that expects a garden name, set to that name 2018-04-21 14:19:40 +12:00
Brenda Wallace
548fb3d3fd Badges feature specs 2018-04-21 14:00:00 +12:00
Brenda Wallace
9966eddd37 Giving gardens unique names to stop test collisions 2018-04-21 13:52:49 +12:00
Brenda Wallace
4c7529eb8e Merge remote-tracking branch 'origin/feature/status' into feature/status 2018-04-21 11:14:32 +12:00
Brenda Wallace
f8b76e9c84 Reducing complexity in planting predictions 2018-04-21 11:12:25 +12:00
Brenda Wallace
16341da7bd Merge branch 'dev' into feature/status 2018-04-21 10:55:40 +12:00
Brenda Wallace
0d7542a43d Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-04-21 10:55:28 +12:00
Brenda Wallace
cdde3994b2 Revert "Auto corrected by following Style/ExpandPathArguments" 
This reverts commit a5b84403bb.
 2018-04-21 10:35:28 +12:00
Brenda Wallace
dc62ab05ad Merge remote-tracking branch 'upstream/dev' into feature/status 2018-04-21 10:21:40 +12:00
Brenda Wallace
c860f7c14b Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-04-21 10:20:38 +12:00
Awesome Code
a5b84403bb Auto corrected by following Style/ExpandPathArguments 2018-04-20 22:19:28 +00:00
Awesome Code
afc4441ce1 Auto corrected by following FactoryBot/CreateList 2018-04-20 22:19:04 +00:00
Brenda Wallace
c2ff3790db set finished false on planting factory 
some code+tests doesn't cope with nil
 2018-04-21 09:22:35 +12:00
Brenda Wallace
279c922b34 Rename update predictions methods to have ! 2018-04-19 13:45:29 +12:00
Brenda Wallace
2a8c4d4829 Add finished and finished_at to plantings factory 2018-04-17 10:06:40 +12:00
Brenda Wallace
934bd9adb8 Fixed bug in spec, wasn't really on member's garden#index 2018-04-16 22:11:36 +12:00
Brenda Wallace
d043613bde Model specs for harvest time and zombies 2018-04-16 21:14:47 +12:00
Brenda Wallace
2d309b7645 Removing jasmine, we have no jasmine specs 2018-04-02 09:58:02 +12:00
Brenda Wallace
ece7113c89 DRY photo helper spec 2018-03-15 22:56:32 +13:00
Brenda Wallace
8941c577e4 Specs for photos helper 2018-03-14 22:25:30 +13:00
Brenda Wallace
f9d4e1d6ae Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550) 
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Removed in-line style
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Moved finishable to a concern
* Seeds.finished_at
* rubocop fixes
* Made seeds sown migration the most recent
* Specs for home page
* Only show current seeds on home page
* Seeds appear for logged in or not
* Buttons to mark seeds finished
* JS for marking seeds finished
* Some actions only appear if seed or planting is active
* Fixed up display of home page
* Fixed typo in admin members#index
* Tidying up actions on all the things
* Harvest description in #index
* Truncate garden description if long
* Updated link label in view spec
* Show planted_from always, becuase it might be a parent seed
* find correct link in spec adding photos to garden
* fixed spec finding link to edit garden
* Better harvest description truncation
* Helping spec find the edit button
* specs for the home page
* Re-instate crops js, but in the correct file now
* Fixed link to garden in actions
* Tweaking mobile view
 2018-03-12 08:39:32 +13:00
Brenda Wallace
42de726405 Removing shop, products, accounts, orders 2018-02-09 10:53:05 +13:00
Brenda Wallace
65b4c7dbc1 Revert "Auto corrected by following Style/StringLiterals" 
This reverts commit ab56a3c6b3.
 2018-02-09 07:58:47 +13:00
Awesome Code
ab56a3c6b3 Auto corrected by following Style/StringLiterals 2018-02-07 10:20:26 +13:00
Brenda Wallace
b2cf022522 Removed extra blank lines 2018-01-29 13:01:49 +13:00