Compare commits

...

150 Commits

Author SHA1 Message Date
dependabot[bot]
d9e7c9a831 Bump factory_bot_rails from 4.10.0 to 4.11.1
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 4.10.0 to 4.11.1.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v4.10.0...v4.11.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-19 17:00:03 +13:00
dependabot[bot]
0e4005897e Bump bullet from 5.7.5 to 5.7.6
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.5...5.7.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-19 16:59:37 +13:00
dependabot[bot]
1c852d992e Merge pull request #1688 from Growstuff/dependabot/bundler/devise-4.5.0 2018-10-18 09:34:55 +00:00
dependabot[bot]
c9084618d0 Bump devise from 4.4.3 to 4.5.0
Bumps [devise](https://github.com/plataformatec/devise) from 4.4.3 to 4.5.0.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.4.3...v4.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-18 09:08:22 +00:00
dependabot[bot]
5021061523 Bump rspec-activemodel-mocks from 1.0.3 to 1.1.0
Bumps [rspec-activemodel-mocks](https://github.com/rspec/rspec-activemodel-mocks) from 1.0.3 to 1.1.0.
- [Release notes](https://github.com/rspec/rspec-activemodel-mocks/releases)
- [Commits](https://github.com/rspec/rspec-activemodel-mocks/compare/v1.0.3...v1.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-18 22:05:35 +13:00
dependabot[bot]
6e0687c2c3 Bump font-awesome-sass from 5.0.13 to 5.4.1
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.0.13 to 5.4.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.0.13...5.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-18 15:50:56 +13:00
dependabot[bot]
2f34846c66 Bump ruby-units from 2.3.0 to 2.3.1
Bumps [ruby-units](https://github.com/olbrich/ruby-units) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/olbrich/ruby-units/releases)
- [Changelog](https://github.com/olbrich/ruby-units/blob/master/CHANGELOG.txt)
- [Commits](https://github.com/olbrich/ruby-units/compare/v2.3.0...v2.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-18 14:20:14 +13:00
Brenda Wallace
d594e19448 Merge branch 'master' into dev 2018-10-16 09:30:14 +13:00
dependabot[bot]
e4f130fa48 Merge pull request #1705 from Growstuff/dependabot/bundler/sidekiq-5.2.2 2018-10-15 20:10:38 +00:00
dependabot[bot]
42f05a0f3e Bump sidekiq from 5.2.1 to 5.2.2
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.1...v5.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-10 08:22:23 +00:00
pozorvlak
cdf9be3590 Merge pull request #1704 from codeminator/fix-warning-in-photos-controller-spec
Fix Warning in specs: PhotoController
2018-10-10 09:19:33 +01:00
pozorvlak
b5347039c0 Merge branch 'dev' into fix-warning-in-photos-controller-spec 2018-10-10 08:38:18 +01:00
pozorvlak
734f97a3eb Merge pull request #1687 from Growstuff/dependabot/bundler/chartkick-3.0.1
Bump chartkick from 2.3.5 to 3.0.1
2018-10-10 08:37:13 +01:00
pozorvlak
e5ef2df518 Merge branch 'dev' into fix-warning-in-photos-controller-spec 2018-10-10 08:34:23 +01:00
Ahmed Shahin
5dde5610eb Add my name to contributors list 2018-10-10 08:46:28 +02:00
Ahmed Shahin
ac535d32e8 Provide message to raise_error 2018-10-10 08:42:05 +02:00
dependabot[bot]
71badfbc3c Bump chartkick from 2.3.5 to 3.0.1
Bumps [chartkick](https://github.com/ankane/chartkick) from 2.3.5 to 3.0.1.
- [Release notes](https://github.com/ankane/chartkick/releases)
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/chartkick/compare/v2.3.5...v3.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-07 08:42:58 +00:00
Brenda Wallace
be7767619c Merge pull request #1702 from Growstuff/dependabot/bundler/newrelic_rpm-5.4.0.347
Bump newrelic_rpm from 5.2.0.345 to 5.4.0.347
2018-10-07 21:40:04 +13:00
Brenda Wallace
0390428bcf Merge pull request #1701 from Growstuff/dev
Release to production
2018-10-07 21:39:27 +13:00
dependabot[bot]
d05569fc27 Bump newrelic_rpm from 5.2.0.345 to 5.4.0.347
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.2.0.345 to 5.4.0.347.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-05 02:53:14 +00:00
Brenda Wallace
4690fb4364 Merge pull request #1700 from Growstuff/dependabot/bundler/nokogiri-1.8.5
[Security] Bump nokogiri from 1.8.4 to 1.8.5
2018-10-05 15:51:10 +13:00
dependabot[bot]
4bdcb782d9 [Security] Bump nokogiri from 1.8.4 to 1.8.5
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.4 to 1.8.5. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.4...v1.8.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-05 02:37:04 +00:00
Brenda Wallace
ea67df0da3 Added dependabot to contributors again 2018-09-12 10:59:13 +12:00
dependabot[bot]
8a3fcf7939 Merge pull request #1686 from Growstuff/dependabot/bundler/sidekiq-5.2.1 2018-09-11 05:00:52 +00:00
dependabot[bot]
b69759754f Bump sidekiq from 5.1.3 to 5.2.1
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.1.3 to 5.2.1.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.1.3...v5.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-11 04:12:12 +00:00
Brenda Wallace
914c981a1d Merge pull request #1690 from Growstuff/dependabot/bundler/rubyzip-1.2.2
[Security] Bump rubyzip from 1.2.1 to 1.2.2
2018-09-11 16:06:46 +12:00
Brenda Wallace
ef60f74624 Removed extra blank lines 2018-09-11 15:57:09 +12:00
Brenda Wallace
9ee0846a30 Merge remote-tracking branch 'upstream/master' into dependabot/bundler/rubyzip-1.2.2 2018-09-11 15:56:07 +12:00
Brenda Wallace
fb4dca03d2 Merge branch 'dev' into dependabot/bundler/rubyzip-1.2.2 2018-09-11 15:51:03 +12:00
Awesome Code
d248f99209 Auto corrected by following Ruby rspec layout 2018-09-11 03:29:48 +00:00
Awesome Code
7301c6cd6c Auto corrected by following Ruby RSpec/HooksBeforeExamples 2018-09-11 03:02:54 +00:00
Brenda Wallace
a5bb24b2a8 Merge branch 'dev' into dependabot/bundler/rubyzip-1.2.2 2018-09-11 14:50:57 +12:00
Brenda Wallace
189d2b49a6 Merge pull request #1647 from Growstuff/dev
Release 47
2018-09-11 10:23:11 +12:00
Awesome Code
34470a8457 Auto corrected by following Ruby Layout/LeadingBlankLines 2018-09-10 22:20:20 +00:00
Awesome Code
90f4db4853 Auto corrected by following Ruby rspec layout 2018-09-10 22:20:12 +00:00
Brenda Wallace
a9d463e9be Merge branch 'dev' into dependabot/bundler/rubyzip-1.2.2 2018-09-11 08:06:59 +12:00
pozorvlak
28503cdca0 Merge pull request #1696 from Growstuff/awesomecode-ruby/factorybot/attributedefinedstatically-22693
Auto corrected by following Ruby FactoryBot/AttributeDefinedStatically
2018-09-10 10:48:20 +01:00
Awesome Code
31744491ea Auto corrected by following Ruby FactoryBot/AttributeDefinedStatically 2018-09-09 21:53:57 +00:00
dependabot[bot]
4ec327f705 [Security] Bump rubyzip from 1.2.1 to 1.2.2
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.1 to 1.2.2. **This update includes security fixes.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.1...v1.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-09 08:35:44 +00:00
Cesy
d541f795f6 Merge pull request #1694 from Br3nda/upgrade/elasticsearch
Upgrade/elasticsearch
2018-09-09 09:33:09 +01:00
Brenda Wallace
03837e193e Test coverage 2018-09-09 14:25:40 +12:00
Brenda Wallace
612bfcffcb Adding codeclimate to env 2018-09-09 13:48:17 +12:00
Brenda Wallace
d0b785bcd3 Pass elasticsearch version from travis.yaml 2018-09-09 13:33:20 +12:00
Brenda Wallace
857c9e9d7a whitespace fixups 2018-09-09 12:44:52 +12:00
Brenda Wallace
913ac45127 Changed query syntax for elasticsearch 2018-09-09 12:40:40 +12:00
Brenda Wallace
27c4dbedf2 Elasticsearch has dropped the string type and is now using text 2018-09-09 12:18:50 +12:00
Brenda Wallace
4867c68984 Added stdout print when creating/refreshing elasticsearch index 2018-09-09 12:11:10 +12:00
Brenda Wallace
a326f92210 Move elastic search index create to same line as db:create 2018-09-09 11:59:50 +12:00
Brenda Wallace
835e277f49 whitepace fix up 2018-09-09 11:58:43 +12:00
Brenda Wallace
7197843ac3 Reindex elasticsearch rake task 2018-09-09 11:56:37 +12:00
Brenda Wallace
ea1fb90279 Create the search index 2018-09-09 11:55:19 +12:00
Brenda Wallace
53b08422ce Force new config when installing elasticsearch 2018-09-09 11:08:34 +12:00
Brenda Wallace
a051523354 Upgrade to elasticsearch 6.2.3 2018-09-09 10:56:21 +12:00
Brenda Wallace
5563b183dc Revert "Remove custom elastic search installer in travis"
This reverts commit d629203570.
2018-09-09 10:52:20 +12:00
Brenda Wallace
69f6c8d5de Merge branch 'dev' into upgrade/elasticsearch 2018-09-09 10:04:19 +12:00
Brenda Wallace
f69f0861d2 Style fix up 2018-09-09 10:04:02 +12:00
Brenda Wallace
d629203570 Remove custom elastic search installer in travis 2018-09-09 09:44:43 +12:00
Brenda Wallace
338e705db7 Upgrade elastic search gems 2018-09-09 09:44:27 +12:00
dependabot[bot]
dfc53747d9 Bump unicorn from 5.4.0 to 5.4.1
Bumps [unicorn](https://bogomips.org/unicorn/) from 5.4.0 to 5.4.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-07 11:45:52 +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
dependabot[bot]
45fcb76f30 Merge pull request #1681 from Growstuff/dependabot/bundler/selenium-webdriver-3.14.0 2018-08-07 09:25:36 +00:00
dependabot[bot]
b5c55f42b8 Bump selenium-webdriver from 3.13.0 to 3.14.0
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-3.13.0...selenium-3.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-08-07 09:07:48 +00:00
dependabot[bot]
53ddb4ef94 Bump rspec-rails from 3.7.2 to 3.8.0
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.7.2 to 3.8.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.7.2...v3.8.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-08-07 21:05:39 +12:00
dependabot[bot]
4147a571a5 Merge pull request #1668 from Growstuff/dependabot/bundler/active_utils-3.3.12 2018-08-06 11:36:17 +00:00
dependabot[bot]
02f4c7f3ac Bump active_utils from 3.3.11 to 3.3.12
Bumps [active_utils](https://github.com/shopify/active_utils) from 3.3.11 to 3.3.12.
- [Release notes](https://github.com/shopify/active_utils/releases)
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md)
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.11...v3.3.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-08-06 08:18:44 +00:00
dependabot[bot]
329f77db78 Bump factory_bot_rails from 4.8.2 to 4.10.0
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 4.8.2 to 4.10.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v4.8.2...v4.10.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-08-06 20:15:13 +12:00
Awesome Code
345fac4358 Auto corrected by following Ruby FactoryBot/StaticAttributeDefinedDynamically 2018-07-21 04:04:00 +00:00
dependabot[bot]
409f24e4e5 Merge pull request #1658 from Growstuff/dependabot/bundler/capybara-screenshot-1.0.21 2018-07-16 09:39:00 +00:00
dependabot[bot]
5dd22d8d1c Bump capybara-screenshot from 1.0.19 to 1.0.21
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot) from 1.0.19 to 1.0.21.
- [Release notes](https://github.com/mattheworiordan/capybara-screenshot/releases)
- [Changelog](https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattheworiordan/capybara-screenshot/compare/v1.0.19...v1.0.21)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-16 09:25:22 +00:00
dependabot[bot]
dbbd7fdeb4 Bump uglifier from 4.1.14 to 4.1.15
Bumps [uglifier](https://github.com/lautis/uglifier) from 4.1.14 to 4.1.15.
- [Release notes](https://github.com/lautis/uglifier/releases)
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lautis/uglifier/compare/v4.1.14...v4.1.15)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-16 21:23:32 +12:00
Brenda Wallace
3c4e1423f9 Merge pull request #1659 from Growstuff/dependabot/bundler/geocoder-1.4.9
Bump geocoder from 1.4.7 to 1.4.9
2018-07-15 08:50:20 +12:00
dependabot[bot]
40600215bc Bump geocoder from 1.4.7 to 1.4.9
Bumps [geocoder](https://github.com/alexreisner/geocoder) from 1.4.7 to 1.4.9.
- [Release notes](https://github.com/alexreisner/geocoder/releases)
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.4.7...v1.4.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-12 08:25:38 +00:00
Brenda Wallace
0bdf42f6c8 Merge pull request #1669 from Growstuff/dependabot/bundler/faker-1.9.1
Bump faker from 1.8.7 to 1.9.1
2018-07-12 20:23:20 +12:00
dependabot[bot]
711fb28f49 Bump faker from 1.8.7 to 1.9.1
Bumps [faker](https://github.com/stympy/faker) from 1.8.7 to 1.9.1.
- [Release notes](https://github.com/stympy/faker/releases)
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-12 07:25:39 +00:00
Brenda Wallace
77f14feae5 Merge pull request #1656 from Growstuff/dependabot/bundler/font-awesome-sass-5.0.13
Bump font-awesome-sass from 5.0.9 to 5.0.13
2018-07-04 13:12:36 +12:00
dependabot[bot]
1b6bbfcfac Bump font-awesome-sass from 5.0.9 to 5.0.13
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.0.9 to 5.0.13.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.0.9...5.0.13)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-03 22:13:14 +00:00
Brenda Wallace
d39af973e0 Merge pull request #1663 from Growstuff/dependabot/bundler/uglifier-4.1.14
Bump uglifier from 4.1.13 to 4.1.14
2018-07-04 10:11:34 +12:00
dependabot[bot]
14dd8bbc8b Bump uglifier from 4.1.13 to 4.1.14
Bumps [uglifier](https://github.com/lautis/uglifier) from 4.1.13 to 4.1.14.
- [Release notes](https://github.com/lautis/uglifier/releases)
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lautis/uglifier/compare/v4.1.13...v4.1.14)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-03 21:03:20 +00:00
Brenda Wallace
72753c2d43 Merge pull request #1660 from Growstuff/dependabot/bundler/chartkick-2.3.5
Bump chartkick from 2.3.4 to 2.3.5
2018-07-04 09:01:36 +12:00
Brenda Wallace
b1854bbd4a Following same syntax in contributors.md 2018-07-04 08:35:14 +12:00
Brenda Wallace
709cd640d2 Adding dependabot-bot and dependabot. 2018-07-04 08:34:34 +12:00
Brenda Wallace
9e7c6584a6 Turning off BundleOutdated in overcommit 2018-07-04 08:27:11 +12:00
dependabot[bot]
1211be2fef Bump chartkick from 2.3.4 to 2.3.5
Bumps [chartkick](https://github.com/ankane/chartkick) from 2.3.4 to 2.3.5.
- [Release notes](https://github.com/ankane/chartkick/releases)
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/chartkick/compare/v2.3.4...v2.3.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-03 10:46:22 +00:00
Brenda Wallace
d712b440b4 Merge pull request #1650 from Growstuff/dependabot/bundler/comfortable_mexican_sofa-1.12.11
Bump comfortable_mexican_sofa from 1.12.10 to 1.12.11
2018-07-03 22:44:10 +12:00
Brenda Wallace
517cfd85e5 Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11 2018-07-03 22:03:58 +12:00
Brenda Wallace
7030c868b6 Fixing deoendabot 2018-07-03 22:01:34 +12:00
Brenda Wallace
d8b39c69ec Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11 2018-07-03 21:01:21 +12:00
Brenda Wallace
e7e997290e Fixed dependabot username 2018-07-03 20:52:24 +12:00
Daniel O'Connor
5d88b65284 Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11 2018-07-02 15:25:39 +09:30
Daniel O'Connor
31d97f4c00 Merge pull request #1653 from Growstuff/dependabot/bundler/newrelic_rpm-5.2.0.345
Bump newrelic_rpm from 5.0.0.342 to 5.2.0.345
2018-07-02 15:24:22 +09:30
Daniel O'Connor
ec9f57e6b8 Merge pull request #1649 from Growstuff/dependabot/bundler/selenium-webdriver-3.13.0
Bump selenium-webdriver from 3.11.0 to 3.13.0
2018-07-02 15:23:53 +09:30
Daniel O'Connor
dd0e9f74e6 Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11 2018-07-02 13:20:41 +09:30
Daniel O'Connor
9d389726f5 Merge branch 'dev' into dependabot/bundler/newrelic_rpm-5.2.0.345 2018-07-02 12:44:26 +09:30
Daniel O'Connor
4fd0096c85 Merge pull request #1651 from Growstuff/dependabot/bundler/rack-protection-2.0.3
Bump rack-protection from 2.0.1 to 2.0.3
2018-07-02 12:44:02 +09:30
Daniel O'Connor
28945b6f20 Merge pull request #1652 from Growstuff/dependabot/bundler/uglifier-4.1.13
Bump uglifier from 4.1.10 to 4.1.13
2018-07-02 12:40:59 +09:30
Daniel O'Connor
b926f07e2a Update CONTRIBUTORS.md 2018-07-02 12:39:59 +09:30
Daniel O'Connor
b10719ecab Merge branch 'dev' into dependabot/bundler/selenium-webdriver-3.13.0 2018-07-02 09:47:13 +09:30
Daniel O'Connor
1527fec441 Merge branch 'dev' into dependabot/bundler/uglifier-4.1.13 2018-07-02 09:46:59 +09:30
Daniel O'Connor
1096fd0e89 Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11 2018-07-02 09:46:39 +09:30
Daniel O'Connor
0cde6ad684 Merge branch 'dev' into dependabot/bundler/newrelic_rpm-5.2.0.345 2018-07-02 09:46:25 +09:30
Daniel O'Connor
8b4951c71a Merge branch 'dev' into dependabot/bundler/rack-protection-2.0.3 2018-07-02 09:46:08 +09:30
Daniel O'Connor
8fe3b1da15 Update CONTRIBUTORS.md 2018-07-02 09:44:50 +09:30
dependabot[bot]
d2c81d6b29 Bump newrelic_rpm from 5.0.0.342 to 5.2.0.345
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.0.0.342 to 5.2.0.345.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-01 11:55:29 +00:00
dependabot[bot]
5ad44c10af Bump uglifier from 4.1.10 to 4.1.13
Bumps [uglifier](https://github.com/lautis/uglifier) from 4.1.10 to 4.1.13.
- [Release notes](https://github.com/lautis/uglifier/releases)
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lautis/uglifier/compare/v4.1.10...v4.1.13)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-01 11:54:50 +00:00
dependabot[bot]
008537a324 Bump rack-protection from 2.0.1 to 2.0.3
Bumps [rack-protection](http://www.sinatrarb.com/protection/) from 2.0.1 to 2.0.3.

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-01 11:52:31 +00:00
dependabot[bot]
116a9a8bab Bump comfortable_mexican_sofa from 1.12.10 to 1.12.11
Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa) from 1.12.10 to 1.12.11.
- [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases)
- [Commits](https://github.com/comfy/comfortable-mexican-sofa/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-01 11:51:52 +00:00
dependabot[bot]
dc7cbadfc0 Bump selenium-webdriver from 3.11.0 to 3.13.0
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.11.0 to 3.13.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-3.11.0...selenium-3.13.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-01 11:50:30 +00:00
Brenda Wallace
1c7a3e27d9 Merge pull request #1648 from Growstuff/dependabot/bundler/sprockets-3.7.2
[Security] Bump sprockets from 3.7.1 to 3.7.2
2018-06-25 15:59:59 +12:00
dependabot[bot]
e66924151a [Security] Bump sprockets from 3.7.1 to 3.7.2
Bumps [sprockets](http://getsprockets.org/) from 3.7.1 to 3.7.2. **This update includes security fixes.**

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-25 03:31:45 +00:00
Brenda Wallace
6f1eed06cc Merge pull request #1646 from robotscissors/issue-565-create-harvests-rss
Issue 565 create harvests RSS
2018-06-19 10:52:10 +12:00
robotscissors
605e2e1392 Add to contributors file 2018-06-18 15:22:27 -07:00
Brenda Wallace
77d2dc6144 Merge branch 'dev' into issue-565-create-harvests-rss 2018-06-17 20:58:32 +12:00
Brenda Wallace
678dabf710 Merge branch 'master' into dev 2018-06-17 10:42:55 +12:00
Brenda Wallace
3a7be86ef9 Merge pull request #1607 from Br3nda/fix/plants-parts-dupe
Don't allow duplicate plant parts names
2018-06-17 10:42:14 +12:00
Brenda Wallace
a5fa69c7c7 Merge branch 'dev' into fix/plants-parts-dupe 2018-06-17 08:47:27 +12:00
Brenda Wallace
1d8c2db674 Merge branch 'dev' into issue-565-create-harvests-rss 2018-06-17 08:47:12 +12:00
Cesy
945edd1cbc Merge pull request #1644 from Br3nda/fix/reminder-email-ordering
Order plantings and harvests in email
2018-06-16 21:37:29 +01:00
Brenda Wallace
f67d39ed63 Merge branch 'dev' into issue-565-create-harvests-rss 2018-06-16 07:53:38 +12:00
Brenda Wallace
103d7375d3 Merge branch 'dev' into fix/plants-parts-dupe 2018-06-16 07:52:51 +12:00
Brenda Wallace
3b2c4a7893 Merge branch 'dev' into fix/reminder-email-ordering 2018-06-16 07:49:06 +12:00
Brenda Wallace
ecf2e82e9e Merge pull request #1645 from Growstuff/Br3nda-patch-1
Pin coverage badge to dev branch
2018-06-16 07:48:36 +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
2f65939d5c Pin coverage badge to dev branch 2018-06-10 11:47:15 +12: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
Brenda Wallace
5dc8bc5ec5 Order plantings and harvests in email 2018-06-04 17:35:06 +12:00
Brenda Wallace
78d9e3c970 Merge pull request #1622 from Growstuff/awesomecode-factorybot/createlist-12138
Auto corrected by following FactoryBot/CreateList
2018-05-13 07:30:24 +12:00
Daniel O'Connor
a772bdaa8d Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-05-10 21:35:39 +09:30
Brenda Wallace
0402fee04d Merge pull request #1637 from Br3nda/fix/remote-currency-methods
Remove some old currency methods from application helper
2018-05-08 07:52:36 +12:00
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
ed3ae8bbd6 Remove some old currency methods from application helper 2018-05-01 13:47:25 +12:00
Brenda Wallace
81adae77f8 Merge pull request #1639 from Growstuff/bundle-update-2018-04-29-130926
Bundle Update on 2018-04-29
2018-04-29 18:30:55 +12:00
deppbot
681b5bbd8c Bundle Update on 2018-04-29 2018-04-29 13:09:27 +08:00
Brenda Wallace
832cfde28d Merge pull request #1635 from Growstuff/bundle-update-2018-04-26-092357
Bundle Update on 2018-04-26
2018-04-28 21:15:22 +12:00
Brenda Wallace
aa9841dc7d Pinned elastic search to 5.0.0. or later 2018-04-28 18:34:26 +12:00
pozorvlak
caa59df3bd Merge pull request #1625 from Growstuff/dev
Release 46
2018-04-27 17:04:31 +01:00
Brenda Wallace
102eaf3d6b Merge branch 'dev' into bundle-update-2018-04-26-092357 2018-04-26 17:39:03 +12:00
Brenda Wallace
7e0e936509 Merge branch 'dev' into bundle-update-2018-04-26-092357 2018-04-26 17:27:13 +12:00
deppbot
5b5eacb738 Bundle Update on 2018-04-26 2018-04-26 09:23:58 +08:00
Brenda Wallace
9fdc9e76df Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-04-22 12:14:23 +12:00
Brenda Wallace
55bfd50123 Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-04-21 21:18:30 +12:00
Brenda Wallace
0d7542a43d Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-04-21 10:55:28 +12:00
Brenda Wallace
c860f7c14b Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-04-21 10:20:38 +12:00
Awesome Code
afc4441ce1 Auto corrected by following FactoryBot/CreateList 2018-04-20 22:19:04 +00:00
69 changed files with 518 additions and 258 deletions

View File

@@ -51,9 +51,6 @@ PreCommit:
command: ['bundle', 'exec', 'haml-lint']
JsonSyntax:
enabled: true
BundleOutdated:
enabled: true
on_warn: warn
BundleAudit:
enabled: true
on_warn: warn

View File

@@ -11,16 +11,20 @@ env:
- GROWSTUFF_ELASTICSEARCH=false RSPEC_TAG=~elasticsearch COVERAGE=false
- STATIC_CHECKS=true
global:
- secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
- GROWSTUFF_SITE_NAME="Growstuff (travis)"
- RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
- secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
before_install:
- ./script/install_phantomjs.sh
- export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
- ./script/install_codeclimate.sh
- ./script/install_linters.sh
# Force Travis to use Elastic Search 2.4.0
- ./script/install_elasticsearch.sh
- VERSION="6.2.3" ./script/install_elasticsearch.sh
before_script:
- >
if [ "${COVERAGE}" = "true" ]; then
./cc-test-reporter before-build
fi
script:
- set -e
- >
@@ -28,7 +32,7 @@ script:
./script/check_static.rb
else
set +e;
RAILS_ENV=test bundle exec rake db:create db:migrate;
RAILS_ENV=test bundle exec rake db:create db:migrate search:create;
bundle exec rake assets:precompile;
bundle exec rspec --tag $RSPEC_TAG spec/;
fi;

View File

@@ -84,7 +84,12 @@ submit the change with your pull request.
- Logan Gingerich / [logangingerich](https://github.com/logangingerich)
- Mark Taffman / [mftaff](https://github.com/mftaff)
- Jennifer Kruse / [jenkr55](https://github.com/jenkr55)
- Christopher Bazin / [RobotScissors](https://github.com/robotscissors)
- Ahmed Shahin / [codeminator](https://www.github.com/codeminator)
## Bots
- Security and Dependency Updates / [deppbot](https://github.com/deppbot)
### Security and Dependency Updates
- DeppBot / [deppbot](https://github.com/deppbot)
- dependabot[bot] / [dependabot-bot] / [dependabot] (https://github.com/dependabot-bot)
- dependabot / [dependabot](https://github.com/dependabot)

View File

@@ -86,9 +86,9 @@ gem "chartkick"
# Project does not use semver, so we want to be in sync with the version of
# elasticsearch we use
# See https://github.com/elastic/elasticsearch-ruby#compatibility
gem "elasticsearch-api", "~> 2.0.0"
gem "elasticsearch-model"
gem "elasticsearch-rails"
gem "elasticsearch-api", ">= 6.0.0"
gem "elasticsearch-model", ">= 6.0.0"
gem "elasticsearch-rails", ">= 6.0.0"
gem "hashie", ">= 3.5.3"
gem 'rake', '>= 10.0.0'

View File

@@ -26,7 +26,7 @@ GEM
addressable
active_median (0.1.4)
activerecord
active_utils (3.3.11)
active_utils (3.3.12)
activesupport (>= 3.2, < 6.0)
i18n
activejob (4.2.10)
@@ -51,9 +51,9 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
arel (6.0.4)
ast (2.4.0)
autoprefixer-rails (8.3.0)
autoprefixer-rails (8.6.4)
execjs
bcrypt (3.1.11)
bcrypt (3.1.12)
better_errors (2.2.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
@@ -72,7 +72,7 @@ GEM
sass (>= 3.3.4)
bootstrap_form (2.7.0)
builder (3.2.3)
bullet (5.7.5)
bullet (5.7.6)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11.0)
byebug (10.0.2)
@@ -87,10 +87,10 @@ GEM
capybara-email (3.0.1)
capybara (>= 2.4, < 4.0)
mail
capybara-screenshot (1.0.19)
capybara-screenshot (1.0.21)
capybara (>= 1.0, < 4)
launchy
chartkick (2.3.4)
chartkick (3.0.1)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
climate_control (0.2.0)
@@ -107,7 +107,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
comfortable_mexican_sofa (1.12.10)
comfortable_mexican_sofa (1.12.11)
active_link_to (>= 1.0.0)
bootstrap-sass (>= 3.2.0)
bootstrap_form (>= 2.2.0)
@@ -123,7 +123,7 @@ GEM
rails-i18n (>= 4.0.0)
sass-rails (>= 4.0.3)
concurrent-ruby (1.0.5)
connection_pool (2.2.1)
connection_pool (2.2.2)
coveralls (0.8.19)
json (>= 1.8, < 3)
simplecov (~> 0.12.0)
@@ -136,7 +136,7 @@ GEM
dalli (2.7.8)
database_cleaner (1.7.0)
debug_inspector (0.0.3)
devise (4.4.3)
devise (4.5.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
@@ -147,41 +147,41 @@ GEM
easy_translate (0.5.1)
thread
thread_safe
elasticsearch (2.0.2)
elasticsearch-api (= 2.0.2)
elasticsearch-transport (= 2.0.2)
elasticsearch-api (2.0.2)
elasticsearch (6.1.0)
elasticsearch-api (= 6.1.0)
elasticsearch-transport (= 6.1.0)
elasticsearch-api (6.1.0)
multi_json
elasticsearch-model (5.0.0)
elasticsearch-model (6.0.0)
activesupport (> 3)
elasticsearch (> 1)
hashie
elasticsearch-rails (5.0.2)
elasticsearch-transport (2.0.2)
elasticsearch-rails (6.0.0)
elasticsearch-transport (6.1.0)
faraday
multi_json
erubis (2.7.0)
excon (0.62.0)
execjs (2.7.0)
factory_bot (4.8.2)
factory_bot (4.11.1)
activesupport (>= 3.0.0)
factory_bot_rails (4.8.2)
factory_bot (~> 4.8.2)
factory_bot_rails (4.11.1)
factory_bot (~> 4.11.1)
railties (>= 3.0.0)
faker (1.8.7)
faker (1.9.1)
i18n (>= 0.7)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.23)
ffi (1.9.25)
figaro (1.1.1)
thor (~> 0.14)
flickraw (0.9.9)
font-awesome-sass (5.0.9)
sass (>= 3.2)
font-awesome-sass (5.4.1)
sassc (>= 1.11)
formatador (0.2.5)
friendly_id (5.2.3)
friendly_id (5.2.4)
activerecord (>= 4.0.0)
geocoder (1.4.7)
geocoder (1.4.9)
gibbon (1.2.1)
httparty
multi_json (>= 1.9.0)
@@ -279,7 +279,7 @@ GEM
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
kgio (2.11.2)
kramdown (1.16.2)
kramdown (1.17.0)
launchy (2.4.3)
addressable (~> 2.3)
leaflet-rails (1.3.1)
@@ -310,8 +310,8 @@ GEM
multi_xml (0.6.0)
multipart-post (2.0.0)
nenv (0.3.0)
newrelic_rpm (5.0.0.342)
nokogiri (1.8.2)
newrelic_rpm (5.4.0.347)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
notiffany (0.1.1)
nenv (~> 0.1)
@@ -341,7 +341,7 @@ GEM
omniauth-oauth (~> 1.1)
rack
orm_adapter (0.5.0)
paperclip (6.0.0)
paperclip (6.1.0)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
mime-types
@@ -367,8 +367,8 @@ GEM
public_suffix (3.0.2)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.9)
rack-protection (2.0.1)
rack (1.6.10)
rack-protection (2.0.3)
rack
rack-test (0.6.3)
rack (>= 1.0)
@@ -413,35 +413,35 @@ GEM
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
redis (4.0.1)
redis (4.0.2)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-activemodel-mocks (1.0.3)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-activemodel-mocks (1.1.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
rspec-mocks (>= 2.99, < 4.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-mocks (3.7.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-rails (3.7.2)
rspec-support (~> 3.8.0)
rspec-rails (3.8.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.49.1)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
@@ -450,12 +450,12 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0)
ruby-units (2.3.0)
ruby-units (2.3.1)
ruby_dep (1.5.0)
ruby_parser (3.11.0)
sexp_processor (~> 4.9)
rubyzip (1.2.1)
sass (3.5.6)
rubyzip (1.2.2)
sass (3.6.0)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -466,14 +466,16 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.11.0)
sassc (2.0.0)
ffi (~> 1.9.6)
rake
selenium-webdriver (3.14.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
sexp_processor (4.11.0)
shellany (0.0.1)
sidekiq (5.1.3)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
sidekiq (5.2.2)
connection_pool (~> 2.2, >= 2.2.2)
rack-protection (>= 1.5.0)
redis (>= 3.3.5, < 5)
simplecov (0.12.0)
@@ -483,7 +485,7 @@ GEM
simplecov-html (0.10.2)
sparkpost_rails (1.5.1)
rails (>= 4.0, < 5.3)
sprockets (3.7.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
@@ -507,10 +509,10 @@ GEM
trollop (1.16.2)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.9)
uglifier (4.1.15)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.3.2)
unicorn (5.4.0)
unicorn (5.4.1)
kgio (~> 2.6)
raindrops (~> 0.7)
uniform_notifier (1.11.0)
@@ -525,7 +527,7 @@ GEM
websocket-extensions (0.1.3)
will_paginate (3.1.6)
xmlrpc (0.3.0)
xpath (3.0.0)
xpath (3.1.0)
nokogiri (~> 1.8)
PLATFORMS
@@ -558,9 +560,9 @@ DEPENDENCIES
dalli
database_cleaner
devise
elasticsearch-api (~> 2.0.0)
elasticsearch-model
elasticsearch-rails
elasticsearch-api (>= 6.0.0)
elasticsearch-model (>= 6.0.0)
elasticsearch-rails (>= 6.0.0)
factory_bot_rails
faker
figaro
@@ -623,4 +625,4 @@ RUBY VERSION
ruby 2.4.1p111
BUNDLED WITH
1.16.1
1.16.4

View File

@@ -1,7 +1,7 @@
# Growstuff
[![Build Status](https://travis-ci.org/Growstuff/growstuff.svg?branch=dev)](https://travis-ci.org/Growstuff/growstuff)
[![Coverage Status](https://coveralls.io/repos/Growstuff/growstuff/badge.png)](https://coveralls.io/r/Growstuff/growstuff)
[![Coverage Status](https://coveralls.io/repos/github/Growstuff/growstuff/badge.svg?branch=dev)](https://coveralls.io/github/Growstuff/growstuff?branch=dev)
[![Code Climate](https://codeclimate.com/github/Growstuff/growstuff/badges/gpa.svg)](https://codeclimate.com/github/Growstuff/growstuff)
Welcome to the Growstuff project.

View File

@@ -3,7 +3,7 @@ class HarvestsController < ApplicationController
after_action :update_crop_medians, only: %i(create update destroy)
load_and_authorize_resource
respond_to :html, :json
respond_to :csv, only: :index
respond_to :csv, :rss, only: :index
responders :flash
def index

View File

@@ -1,26 +1,9 @@
module ApplicationHelper
def price_in_dollars(price)
format('%.2f', price / 100.0)
end
# 999 cents becomes 9.99 AUD -- for products/orders/etc
def price_with_currency(price)
format('%.2f %s', price / 100.0, Growstuff::Application.config.currency)
end
def parse_date(str)
str ||= '' # Date.parse barfs on nil
str == '' ? nil : Date.parse(str)
end
def forex_link(price)
pid = price_in_dollars(price)
currency = Growstuff::Application.config.currency
link = "http://www.wolframalpha.com/input/?i=#{pid}+#{currency}"
link_to "(convert)", link, target: "_blank", rel: "noopener noreferrer"
end
def build_alert_classes(alert_type = :info)
classes = 'alert alert-dismissable '
case alert_type.to_sym

View File

@@ -26,8 +26,8 @@ class Notifier < ActionMailer::Base
def planting_reminder(member)
@member = member
@plantings = @member.plantings.first(5)
@harvests = @member.harvests.first(5)
@plantings = @member.plantings.order(planted_at: :desc).first(5)
@harvests = @member.harvests.order(harvested_at: :desc).first(5)
# Encrypting
message = { member_id: @member.id, type: :send_planting_reminder }

View File

@@ -78,18 +78,18 @@ class Crop < ActiveRecord::Base
} do
mappings dynamic: 'false' do
indexes :id, type: 'long'
indexes :name, type: 'string', analyzer: 'gs_edgeNGram_analyzer'
indexes :approval_status, type: 'string'
indexes :name, type: 'text', analyzer: 'gs_edgeNGram_analyzer'
indexes :approval_status, type: 'text'
indexes :scientific_names do
indexes :name,
type: 'string',
type: 'text',
analyzer: 'gs_edgeNGram_analyzer',
# Disabling field-length norm (norm). If the norm option is turned on(by default),
# higher weigh would be given for shorter fields, which in our case is irrelevant.
norms: { enabled: false }
end
indexes :alternate_names do
indexes :name, type: 'string', analyzer: 'gs_edgeNGram_analyzer'
indexes :name, type: 'text', analyzer: 'gs_edgeNGram_analyzer'
end
end
end

View File

@@ -5,6 +5,8 @@ class PlantPart < ActiveRecord::Base
has_many :harvests
has_many :crops, -> { uniq }, through: :harvests
validates :name, presence: true, uniqueness: true
def to_s
name
end

View File

@@ -3,21 +3,19 @@ class CropSearchService
def self.search(query)
if ENV['GROWSTUFF_ELASTICSEARCH'] == "true"
search_str = query.nil? ? "" : query.downcase
response = Crop.__elasticsearch__.search( # Finds documents which match any field, but uses the _score from
# the best field insead of adding up _score from each field.
response = Crop.__elasticsearch__.search(
query: {
multi_match: {
query: search_str.to_s,
analyzer: "standard",
fields: ["name",
"scientific_names.scientific_name",
"alternate_names.name"]
bool: {
filter: {
term: { "approval_status" => "approved" }
},
must: {
query_string: {
query: "*#{search_str}*"
}
}
}
},
filter: {
term: { approval_status: "approved" }
},
size: 50
}
)
response.records.to_a
else

View File

@@ -24,8 +24,10 @@
%ul.list-inline
%li The data on this page is available in the following formats:
- if @owner
%li= link_to "RSS", harvests_by_owner_path(@owner, format: 'rss')
%li= link_to "CSV", harvests_by_owner_path(@owner, format: 'csv')
%li= link_to "JSON", harvests_by_owner_path(@owner, format: 'json')
- else
%li= link_to "RSS", harvests_path(format: 'rss')
%li= link_to "CSV", harvests_path(format: 'csv')
%li= link_to "JSON", harvests_path(format: 'json')

View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
%rss{ version: 2.0 }
%channel
%title
Recent harvests from #{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})
%link= harvests_url
- @harvests.each do |harvest|
%item
%title #{harvest.owner.login_name}'s #{harvest.crop.name}
%pubdate= harvest.harvested_at.to_s(:rfc822)
%description
:escaped
<p>Crop: #{harvest.crop ? harvest.crop : 'unknown' }</p>
<p>Quantity: #{harvest.quantity ? harvest.quantity : 'unknown' }</p>
<p>Harvested on: #{harvest.harvested_at ? harvest.harvested_at : 'unknown' }</p>
:escaped_markdown
#{ strip_tags harvest.description }
%link= harvest_url(harvest)
%guid= harvest_url(harvest)

11
lib/tasks/search.rake Normal file
View File

@@ -0,0 +1,11 @@
namespace :search do
desc "Create elastic search index"
task create: :environment do
puts Crop.__elasticsearch__.create_index! force: true
end
desc 'Refresh elastic search index'
task refresh: :environment do
puts Crop.__elasticsearch__.refresh_index!
end
end

View File

@@ -1,10 +1,14 @@
#!/bin/bash
if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then
[[ -z "$VERSION" ]] && VERSION="6.2.3"
set -euv
sudo dpkg -r elasticsearch
curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.0/elasticsearch-2.4.0.deb
sudo dpkg -i --force-confnew elasticsearch-2.4.0.deb
wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${VERSION}.deb
wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${VERSION}.deb.sha512
shasum -a 512 -c elasticsearch-${VERSION}.deb.sha512
sudo dpkg -i --force-confnew elasticsearch-${VERSION}.deb
sudo service elasticsearch start
sleep 10
curl -v localhost:9200

View File

@@ -5,18 +5,23 @@ describe Charts::GardensController do
let(:valid_params) { { name: 'My second Garden' } }
let(:garden) { FactoryBot.create :garden }
context "when not signed in" do
describe 'GET timeline' do
before { get :timeline, garden_id: garden.to_param }
it { expect(response).to be_success }
end
end
context "when signed in" do
before(:each) { sign_in member }
let!(:member) { FactoryBot.create(:member) }
describe 'GET timeline' do
before { get :timeline, garden_id: garden.to_param }
it { expect(response).to be_success }
end
end

View File

@@ -2,6 +2,7 @@ require 'rails_helper'
describe CommentsController do
subject { response }
let(:member) { FactoryBot.create(:member) }
before(:each) do
@@ -20,6 +21,7 @@ describe CommentsController do
describe "returns an RSS feed" do
before { get :index, format: "rss" }
it { is_expected.to be_success }
it { is_expected.to render_template("comments/index") }
it { expect(response.content_type).to eq("application/rss+xml") }
@@ -81,11 +83,13 @@ describe CommentsController do
expect(response).to redirect_to(comment.post)
end
end
describe "not my comment" do
let(:comment) { FactoryBot.create :comment }
it { expect(response).not_to be_success }
end
describe "attempting to change post_id" do
let(:post) { FactoryBot.create :post, subject: 'our post' }
let(:other_post) { FactoryBot.create :post, subject: 'the other post' }

View File

@@ -16,6 +16,7 @@ describe CropsController do
describe "GET crop wrangler homepage" do
describe 'fetches the crop wrangler homepage' do
before { get :wrangle }
it { is_expected.to be_success }
it { is_expected.to render_template("crops/wrangle") }
it { expect(assigns[:crop_wranglers]).to eq(Role.crop_wranglers) }
@@ -25,6 +26,7 @@ describe CropsController do
describe "GET crop hierarchy " do
describe 'fetches the crop hierarchy page' do
before { get :hierarchy }
it { is_expected.to be_success }
it { is_expected.to render_template("crops/hierarchy") }
end
@@ -33,6 +35,7 @@ describe CropsController do
describe "GET crop search" do
describe 'fetches the crop search page' do
before { get :search }
it { is_expected.to be_success }
it { is_expected.to render_template("crops/search") }
end
@@ -41,6 +44,7 @@ describe CropsController do
describe "GET RSS feed" do
describe "returns an RSS feed" do
before { get :index, format: "rss" }
it { is_expected.to be_success }
it { is_expected.to render_template("crops/index") }
it { expect(response.content_type).to eq("application/rss+xml") }

View File

@@ -5,15 +5,20 @@ RSpec.describe GardensController, type: :controller do
let(:valid_params) { { name: 'My second Garden' } }
let(:garden) { FactoryBot.create :garden }
context "when not signed in" do
describe 'GET new' do
before { get :new, id: garden.to_param }
it { expect(response).to redirect_to(new_member_session_path) }
end
describe 'PUT create' do
before { put :create, garden: valid_params }
it { expect(response).to redirect_to(new_member_session_path) }
end
describe 'changing existing records' do
before do
allow(Garden).to receive(:find).and_return(:garden)
@@ -23,20 +28,27 @@ RSpec.describe GardensController, type: :controller do
expect(garden).not_to receive(:update!)
expect(garden).not_to receive(:destroy)
end
describe 'GET edit' do
before { get :edit, id: garden.to_param }
it { expect(response).to redirect_to(new_member_session_path) }
end
describe 'POST update' do
before { post :update, id: garden.to_param, garden: valid_params }
it { expect(response).to redirect_to(new_member_session_path) }
end
describe 'DELETE' do
before { delete :destroy, id: garden.to_param, params: { garden: valid_params } }
it { expect(response).to redirect_to(new_member_session_path) }
end
end
end
context "when signed in" do
before(:each) { sign_in member }
@@ -56,14 +68,19 @@ RSpec.describe GardensController, type: :controller do
describe 'GET edit' do
before { get :edit, id: not_my_garden.to_param }
it { expect(response).to redirect_to(root_path) }
end
describe 'POST update' do
before { post :update, id: not_my_garden.to_param, garden: valid_params }
it { expect(response).to redirect_to(root_path) }
end
describe 'DELETE' do
before { delete :destroy, id: not_my_garden.to_param, params: { garden: valid_params } }
it { expect(response).to redirect_to(root_path) }
end
end

View File

@@ -22,23 +22,27 @@ describe HarvestsController do
describe "assigns all harvests as @harvests" do
before { get :index, {} }
it { assigns(:harvests).should =~ [harvest1, harvest2] }
end
describe "picks up owner from params and shows owner's harvests only" do
before { get :index, owner: member1.slug }
it { expect(assigns(:owner)).to eq member1 }
it { expect(assigns(:harvests)).to eq [harvest1] }
end
describe "picks up crop from params and shows the harvests for the crop only" do
before { get :index, crop: maize.name }
it { expect(assigns(:crop)).to eq maize }
it { expect(assigns(:harvests)).to eq [harvest2] }
end
describe "generates a csv" do
before { get :index, format: "csv" }
it { expect(response.status).to eq 200 }
end
end
@@ -48,6 +52,7 @@ describe HarvestsController do
describe "assigns the requested harvest as @harvest" do
before { get :show, id: harvest.to_param }
it { expect(assigns(:harvest)).to eq(harvest) }
end
end
@@ -69,6 +74,7 @@ describe HarvestsController do
describe "assigns the requested harvest as @harvest" do
before { get :edit, id: harvest.to_param }
it { expect(assigns(:harvest)).to eq(harvest) }
end
end
@@ -96,6 +102,7 @@ describe HarvestsController do
let(:planting) { FactoryBot.create(:planting, owner_id: member.id, garden: member.gardens.first) }
before { post :create, harvest: valid_attributes.merge(planting_id: planting.id) }
it { expect(Harvest.last.planting.id).to eq(planting.id) }
end
end
@@ -124,6 +131,7 @@ describe HarvestsController do
allow(Harvest).to receive(:new).and_return(harvest)
post :create, harvest: valid_attributes.merge(planting_id: not_my_planting.id)
end
it { expect(harvest.planting_id).not_to eq(not_my_planting.id) }
end
end
@@ -179,6 +187,7 @@ describe HarvestsController do
put :update, id: harvest.to_param,
harvest: valid_attributes.merge(planting_id: not_my_planting.id)
end
it { expect(harvest.planting_id).to eq(nil) }
end
end

View File

@@ -9,8 +9,10 @@ describe LikesController do
before { sign_in member }
describe "POST create" do
it { expect(response.content_type).to eq "application/json" }
before { post :create, post_id: blogpost.id, format: :json }
it { expect(response.content_type).to eq "application/json" }
it { expect(Like.last.likeable_id).to eq(blogpost.id) }
it { expect(Like.last.likeable_type).to eq('Post') }
it { JSON.parse(response.body)["description"] == "1 like" }
@@ -26,6 +28,7 @@ describe LikesController do
describe "DELETE destroy" do
before { delete :destroy, id: like.id, format: :json }
it { expect(response.content_type).to eq "application/json" }
describe "un-liking something i liked before" do

View File

@@ -39,6 +39,7 @@ describe PhotosController do
describe "planting photos" do
before(:each) { get :new, type: "planting", id: planting.id }
it { assigns(:flickr_auth).should be_an_instance_of(Authentication) }
it { assigns(:item).should eq planting }
it { expect(flash[:alert]).not_to be_present }
@@ -47,12 +48,14 @@ describe PhotosController do
describe "harvest photos" do
before { get :new, type: "harvest", id: harvest.id }
it { assigns(:item).should eq harvest }
it { expect(flash[:alert]).not_to be_present }
end
describe "garden photos" do
before { get :new, type: "garden", id: garden.id }
it { assigns(:item).should eq garden }
it { expect(flash[:alert]).not_to be_present }
end
@@ -76,6 +79,7 @@ describe PhotosController do
describe "with valid params" do
before { controller.stub(:current_member) { member } }
it "attaches the photo to a planting" do
post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id
expect(flash[:alert]).not_to be_present
@@ -87,6 +91,7 @@ describe PhotosController do
post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id
post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id
end
it { expect(flash[:alert]).not_to be_present }
it { expect(Photo.last.plantings.size).to eq 1 }
end
@@ -108,7 +113,7 @@ describe PhotosController do
comment = FactoryBot.create(:comment)
expect do
post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "comment", id: comment.id
end.to raise_error
end.to raise_error('Photos not supported')
end
end
@@ -127,6 +132,7 @@ describe PhotosController do
describe "with matching owners" do
before { controller.stub(:current_member) { member } }
it "creates the planting/photo link" do
planting = FactoryBot.create(:planting, garden: garden, owner: member)
photo = FactoryBot.create(:photo, owner: member)

View File

@@ -20,17 +20,20 @@ describe PlantingsController do
describe "assigns all plantings as @plantings" do
before { get :index, {} }
it { expect(assigns(:plantings)).to match [planting1, planting2] }
end
describe "picks up owner from params and shows owner's plantings only" do
before { get :index, owner: member1.slug }
it { expect(assigns(:owner)).to eq member1 }
it { expect(assigns(:plantings)).to eq [planting1] }
end
describe "picks up crop from params and shows the plantings for the crop only" do
before { get :index, crop: maize.name }
it { expect(assigns(:crop)).to eq maize }
it { expect(assigns(:plantings)).to eq [planting2] }
end
@@ -41,11 +44,13 @@ describe PlantingsController do
let(:crop) { FactoryBot.create(:crop) }
before { get :new, crop_id: crop.id }
it { expect(assigns(:crop)).to eq(crop) }
end
describe "doesn't die if no crop specified" do
before { get :new, {} }
it { expect(assigns(:crop)).to be_a_new(Crop) }
end
@@ -53,6 +58,7 @@ describe PlantingsController do
let(:garden) { FactoryBot.create(:garden, owner: member) }
before { get :new, garden_id: garden.id }
it { expect(assigns(:garden)).to eq(garden) }
end
@@ -61,6 +67,7 @@ describe PlantingsController do
let(:garden) { FactoryBot.create(:garden, owner: another_member) }
before { get :new, garden_id: garden.id }
it { expect(assigns(:garden)).not_to eq(garden) }
end
@@ -69,6 +76,7 @@ describe PlantingsController do
let!(:garden) { FactoryBot.create(:garden, owner: member) }
before { get :new, crop_id: crop.id }
it { expect(assigns(:crop)).not_to eq(crop) }
end
@@ -77,22 +85,27 @@ describe PlantingsController do
let!(:garden) { FactoryBot.create(:garden, owner: member) }
before { get :new, crop_id: crop.id }
it { expect(assigns(:crop)).not_to eq(crop) }
end
describe "doesn't die if no garden specified" do
before { get :new, {} }
it { expect(assigns(:garden)).to be_a_new(Garden) }
end
describe "sets the date of the planting to today" do
before { get :new, {} }
it { expect(assigns(:planting).planted_at).to eq Time.zone.today }
end
context 'with parent seed' do
let(:seed) { FactoryBot.create :seed, owner: member }
before { get :new, seed_id: seed.to_param }
it { expect(assigns(:seed)).to eq(seed) }
end
end
@@ -100,6 +113,7 @@ describe PlantingsController do
describe 'POST :create' do
describe "sets the owner automatically" do
before { post :create, planting: valid_attributes }
it { expect(assigns(:planting).owner).to eq subject.current_member }
end
end

View File

@@ -5,6 +5,7 @@ describe SeedsController do
describe "GET index" do
before { get :index, owner: owner.slug }
it "picks up owner from params" do
assigns(:owner).should eq(owner)
end
@@ -21,7 +22,9 @@ describe SeedsController do
context 'with parent planting' do
let(:planting) { FactoryBot.create :planting, owner: owner }
before { get :new, planting_id: planting.to_param }
it { expect(assigns(:planting)).to eq(planting) }
end
end

View File

@@ -2,13 +2,13 @@
FactoryBot.define do
factory :alternate_name do
name "alternate name"
name { "alternate name" }
crop
creator
factory :alternate_eggplant do
association :crop, factory: :eggplant
name "aubergine"
name { "aubergine" }
end
end
end

View File

@@ -3,14 +3,14 @@
FactoryBot.define do
factory :authentication do
member
provider 'twitter'
uid 'foo'
secret 'bar'
name 'baz'
provider { 'twitter' }
uid { 'foo' }
secret { 'bar' }
name { 'baz' }
factory :flickr_authentication do
provider 'flickr'
uid 'blah@blah'
provider { 'flickr' }
uid { 'blah@blah' }
end
end
end

View File

@@ -1,83 +1,83 @@
FactoryBot.define do
factory :crop do
name "magic bean"
en_wikipedia_url "http://en.wikipedia.org/wiki/Magic_bean"
approval_status "approved"
name { "magic bean" }
en_wikipedia_url { "http://en.wikipedia.org/wiki/Magic_bean" }
approval_status { "approved" }
creator
factory :annual_crop, parent: :crop do
perennial false
perennial { false }
end
factory :perennial_crop, parent: :crop do
perennial true
perennial { true }
end
factory :tomato do
name "tomato"
en_wikipedia_url "http://en.wikipedia.org/wiki/Tomato"
name { "tomato" }
en_wikipedia_url { "http://en.wikipedia.org/wiki/Tomato" }
end
factory :maize do
name "maize"
en_wikipedia_url "http://en.wikipedia.org/wiki/Maize"
name { "maize" }
en_wikipedia_url { "http://en.wikipedia.org/wiki/Maize" }
end
factory :chard do
name "chard"
name { "chard" }
end
factory :walnut do
name "walnut"
name { "walnut" }
end
factory :apple do
name "apple"
name { "apple" }
end
factory :pear do
name "pear"
name { "pear" }
end
# for testing varieties
factory :roma do
name "roma tomato"
name { "roma tomato" }
end
factory :popcorn do
name "popcorn"
name { "popcorn" }
end
factory :eggplant do
name "eggplant"
name { "eggplant" }
end
# This should have a name that is alphabetically earlier than :uppercase
# crop to ensure that the ordering tests work.
factory :lowercasecrop do
name "ffrench bean"
name { "ffrench bean" }
end
factory :uppercasecrop do
name "Swiss chard"
name { "Swiss chard" }
end
factory :autoloaded_crop do
creator "cropbot"
creator { "cropbot" }
end
# for testing crop request
factory :crop_request do
name "Ultra berry"
en_wikipedia_url ""
approval_status "pending"
name { "Ultra berry" }
en_wikipedia_url { "" }
approval_status { "pending" }
association :requester, factory: :member
request_notes "Please approve this even though it's fake."
request_notes { "Please approve this even though it's fake." }
end
factory :rejected_crop do
name "Fail bean"
approval_status "rejected"
reason_for_rejection "Totally fake"
name { "Fail bean" }
approval_status { "rejected" }
reason_for_rejection { "Totally fake" }
end
end
end

View File

@@ -2,8 +2,8 @@
FactoryBot.define do
factory :forum do
name "Permaculture"
description "*Everything* about permaculture!"
name { "Permaculture" }
description { "*Everything* about permaculture!" }
owner
end
end

View File

@@ -1,24 +1,24 @@
FactoryBot.define do
factory :garden do
name { Faker::Vehicle.vin }
description "This is a **totally** cool garden"
description { "This is a **totally** cool garden" }
owner
active true
area 23
area_unit "acre"
location "Greenwich, UK"
active { true }
area { 23 }
area_unit { "acre" }
location { "Greenwich, UK" }
factory :inactive_garden do
active false
active { false }
end
# the following are used for testing alphabetical ordering
factory :garden_a do
name 'A garden starting with A'
name { 'A garden starting with A' }
end
factory :garden_z do
name 'Zzzz this garden makes me sleepy'
name { 'Zzzz this garden makes me sleepy' }
end
end
end

View File

@@ -3,15 +3,15 @@
FactoryBot.define do
factory :harvest do
crop { planting.present? ? planting.crop : FactoryBot.create(:crop) }
plant_part
planting nil
plant_part { FactoryBot.create :plant_part }
planting { nil }
owner { planting.present? ? planting.owner : FactoryBot.create(:member) }
harvested_at { Time.zone.local(2015, 9, 17) }
quantity "3"
unit "individual"
weight_quantity 6
weight_unit "kg"
description "A lovely harvest"
quantity { "3" }
unit { "individual" }
weight_quantity { 6 }
weight_unit { "kg" }
description { "A lovely harvest" }
factory :harvest_with_planting do
planting
@@ -19,10 +19,10 @@ FactoryBot.define do
end
trait :long_description do
description "This is a very long description that is so very long that it will need to be cut off"
description { "This is a very long description that is so very long that it will need to be cut off" }
end
trait :no_description do
description ""
description { "" }
end
end

View File

@@ -4,59 +4,59 @@ FactoryBot.define do
factory :member, aliases: %i(author owner sender recipient creator) do
login_name { generate(:login_name) }
password 'password1'
password { 'password1' }
email { generate(:email) }
tos_agreement true
tos_agreement { true }
confirmed_at { Time.now }
show_email false
bio 'I love seeds'
show_email { false }
bio { 'I love seeds' }
# cropbot is needed for certain tests, eg. Crop.create_from_csv
factory :cropbot do
login_name 'cropbot'
login_name { 'cropbot' }
end
factory :no_tos_member do
tos_agreement false
tos_agreement { false }
end
factory :newsletter_recipient_member do
newsletter true
newsletter { true }
end
factory :no_bio_member do
bio nil
bio { nil }
end
factory :unconfirmed_member do
confirmed_at nil
confirmed_at { nil }
end
# this member has very loose privacy settings
factory :public_member do
login_name 'NothingToHide'
show_email true
login_name { 'NothingToHide' }
show_email { true }
end
factory :london_member do
sequence(:login_name) { |n| "JohnH#{n}" } # for the astronomer who figured out longitude
location 'Greenwich, UK'
location { 'Greenwich, UK' }
# including lat/long explicitly because geocoder doesn't work with FG
latitude 51.483
longitude 0.004
latitude { 51.483 }
longitude { 0.004 }
end
factory :edinburgh_member do
location 'Edinburgh'
latitude 55.953252
location { 'Edinburgh' }
latitude { 55.953252 }
longitude { -3.188267 }
end
factory :south_pole_member do
sequence(:login_name) { |n| "ScottRF#{n}" }
location 'Amundsen-Scott Base, Antarctica'
location { 'Amundsen-Scott Base, Antarctica' }
latitude { -90 }
longitude 0
longitude { 0 }
end
factory :admin_member do
@@ -69,39 +69,39 @@ FactoryBot.define do
end
factory :invalid_member_shortname do
login_name 'a'
login_name { 'a' }
end
factory :invalid_member_longname do
login_name 'MarmadukeBlundellHollinsheadBlundellTolemachePlantagenetWhistlebinkie3rdDukeofMarmoset'
login_name { 'MarmadukeBlundellHollinsheadBlundellTolemachePlantagenetWhistlebinkie3rdDukeofMarmoset' }
end
factory :invalid_member_spaces do
login_name "a b"
login_name { "a b" }
end
factory :invalid_member_badchars do
login_name 'aa%$'
login_name { 'aa%$' }
end
factory :invalid_member_badname do
login_name 'admin'
login_name { 'admin' }
end
factory :valid_member_alphanumeric do
login_name 'abc123'
login_name { 'abc123' }
end
factory :valid_member_uppercase do
login_name 'ABC123'
login_name { 'ABC123' }
end
factory :valid_member_underscore do
login_name 'abc_123'
login_name { 'abc_123' }
end
factory :no_email_notifications_member do
send_notification_email false
send_notification_email { false }
end
end
end

View File

@@ -4,9 +4,10 @@ FactoryBot.define do
factory :notification, aliases: [:message] do
sender
recipient
subject "MyString"
body "MyText"
read false
subject { "MyString" }
body { "MyText" }
read { false }
post
factory :no_email_notification do

View File

@@ -3,17 +3,17 @@
FactoryBot.define do
factory :photo do
owner
flickr_photo_id 1
flickr_photo_id { 1 }
title { Faker::HarryPotter.quote }
license_name "CC-BY"
license_url "http://example.com/license.html"
license_name { "CC-BY" }
license_url { "http://example.com/license.html" }
thumbnail_url { "http://example.com/#{Faker::File.file_name}.jpg" }
fullsize_url { "http://example.com/#{Faker::File.file_name}.jpg" }
link_url { Faker::Internet.url }
factory :unlicensed_photo do
license_name "All rights reserved"
license_url ""
license_name { "All rights reserved" }
license_url { "" }
end
end
end

View File

@@ -2,6 +2,6 @@
FactoryBot.define do
factory :plant_part do
name "pollen"
name { "#{Faker::Book.title}_#{rand(100..999)}" }
end
end

View File

@@ -4,37 +4,37 @@ FactoryBot.define do
garden { FactoryBot.create :garden, owner: owner }
crop
planted_at { Time.zone.local(2014, 7, 30) }
quantity 33
description "This is a *really* good plant."
finished false
finished_at nil
quantity { 33 }
description { "This is a *really* good plant." }
finished { false }
finished_at { nil }
factory :seed_planting do
planted_from 'seed'
planted_from { 'seed' }
end
factory :seedling_planting do
planted_from 'seedling'
planted_from { 'seedling' }
end
factory :cutting_planting do
planted_from 'cutting'
planted_from { 'cutting' }
end
factory :sunny_planting do
sunniness 'sun'
sunniness { 'sun' }
end
factory :semi_shady_planting do
sunniness 'semi-shade'
sunniness { 'semi-shade' }
end
factory :shady_planting do
sunniness 'shade'
sunniness { 'shade' }
end
factory :finished_planting do
finished true
finished { true }
planted_at { Time.zone.local(2014, 7, 30) }
finished_at { Time.zone.local(2014, 8, 30) }
end

View File

@@ -1,18 +1,19 @@
FactoryBot.define do
factory :post do
subject "A Post"
body "This is some text."
subject { "A Post" }
body { "This is some text." }
author
created_at { Time.now }
# Markdown is allowed in posts
factory :markdown_post do
body "This is some **strong** text."
body { "This is some **strong** text." }
end
# HTML isn't allowed in posts
factory :html_post do
body '<a href="http://evil.com">EVIL</a>'
body { '<a href="http://evil.com">EVIL</a>' }
end
factory :forum_post do

View File

@@ -2,17 +2,17 @@
FactoryBot.define do
factory :role do
name "Moderator"
description "These people moderate the forums"
name { "Moderator" }
description { "These people moderate the forums" }
initialize_with { Role.find_or_create_by(name: name) }
factory :admin do
name "admin"
name { "admin" }
end
factory :crop_wrangler do
name "Crop Wrangler"
description "they wrangle crops"
name { "Crop Wrangler" }
description { "they wrangle crops" }
end
end
end

View File

@@ -1,17 +1,17 @@
FactoryBot.define do
factory :scientific_name do
association :crop, factory: :crop
name "Beanus Magicus"
name { "Beanus Magicus" }
creator
factory :zea_mays do
association :crop, factory: :maize
name "Zea mays"
name { "Zea mays" }
end
factory :solanum_lycopersicum do
association :crop, factory: :tomato
name "Solanum lycopersicum"
name { "Solanum lycopersicum" }
end
end
end

View File

@@ -4,30 +4,30 @@ FactoryBot.define do
factory :seed do
owner
crop
description "MyText"
quantity 1
plant_before "2013-07-15"
tradable_to 'nowhere'
organic 'unknown'
gmo 'unknown'
heirloom 'unknown'
days_until_maturity_min nil
days_until_maturity_max nil
finished_at nil
description { "MyText" }
quantity { 1 }
plant_before { "2013-07-15" }
tradable_to { 'nowhere' }
organic { 'unknown' }
gmo { 'unknown' }
heirloom { 'unknown' }
days_until_maturity_min { nil }
days_until_maturity_max { nil }
finished_at { nil }
factory :finished_seed do
finished true
finished { true }
finished_at { Date.new }
end
factory :tradable_seed do
tradable_to "locally"
finished false
finished_at nil
tradable_to { "locally" }
finished { false }
finished_at { nil }
end
factory :untradable_seed do
tradable_to "nowhere"
tradable_to { "nowhere" }
end
end
end

View File

@@ -10,6 +10,7 @@ feature "crop detail page", js: true do
visit crop_path(crop)
page
end
let(:crop) { create :crop }
context "varieties" do
@@ -190,6 +191,7 @@ feature "crop detail page", js: true do
planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
planting.crop.update_medians
end
it "predicts harvest" do
is_expected.to have_text("First harvest expected 20 days after planting")
end
@@ -254,18 +256,21 @@ feature "crop detail page", js: true do
context 'annual and perennial' do
before { visit crop_path(crop) }
context 'crop is an annual' do
let(:crop) { FactoryBot.create :annual_crop }
it { expect(page).to have_text 'annual crop (living and reproducing in a single year or less)' }
it { expect(page).not_to have_text 'perennial crop (living more than two years)' }
end
context 'crop is perennial' do
let(:crop) { FactoryBot.create :perennial_crop }
it { expect(page).to have_text 'perennial crop (living more than two years)' }
it { expect(page).not_to have_text 'annual crop (living and reproducing in a single year or less)' }
end
context 'crop perennial value is null' do
let(:crop) { FactoryBot.create :crop, perennial: nil }

View File

@@ -2,6 +2,7 @@ require 'rails_helper'
feature "crop detail page", js: true do
subject { page }
let(:member) { create :member }
let(:crop) { create :crop, plantings: [planting], harvests: [harvest] }
@@ -34,10 +35,12 @@ feature "crop detail page", js: true do
it { is_expected.to have_xpath("//img[contains(@src,'#{photo1.thumbnail_url}')]") }
it { is_expected.to have_xpath("//img[contains(@src,'#{photo2.thumbnail_url}')]") }
end
describe "show harvest photos" do
it { is_expected.to have_xpath("//img[contains(@src,'#{photo3.thumbnail_url}')]") }
it { is_expected.to have_xpath("//img[contains(@src,'#{photo4.thumbnail_url}')]") }
end
describe "link to more photos" do
it { is_expected.to have_link "more photos" }
end
@@ -47,10 +50,12 @@ feature "crop detail page", js: true do
background { login_as(create(:member)) }
include_examples "shows photos"
end
context "when signed in as photos owner" do
background { login_as(member) }
include_examples "shows photos"
end
context "when not signed in " do
include_examples "shows photos"
end

View File

@@ -3,9 +3,11 @@ require 'custom_matchers'
feature "Gardens" do
context 'logged in' do
subject { page }
let(:member) { FactoryBot.create :member }
background { login_as member }
subject { page }
let(:garden) { member.gardens.first }
describe '#index' do
@@ -21,6 +23,7 @@ feature "Gardens" do
context 'my gardens' do
before { visit gardens_path(owner: member) }
include_examples "has buttons bar at top"
it "has actions on garden" do
within '.garden-actions' do
@@ -32,12 +35,16 @@ feature "Gardens" do
end
end
end
context 'all gardens' do
before { visit gardens_path }
include_examples "has buttons bar at top"
end
context "other member's garden" do
before { visit gardens_path(owner: FactoryBot.create(:member)) }
include_examples "has buttons bar at top"
it 'does not show actions on other member garden' do
is_expected.not_to have_link 'Plant something'

View File

@@ -4,6 +4,7 @@ require 'custom_matchers'
feature "Gardens#index", :js do
context "Logged in as member" do
let(:member) { FactoryBot.create :member, login_name: 'shadow' }
background { login_as member }
context "with 10 gardens" do
@@ -58,6 +59,7 @@ feature "Gardens#index", :js do
before do
visit gardens_path(member: member)
end
it "shows planting in garden" do
expect(page).to have_link(planting.crop.name, href: planting_path(planting))
end
@@ -71,6 +73,7 @@ feature "Gardens#index", :js do
let(:garden) { member.gardens.first }
let(:member) { FactoryBot.create :member, login_name: 'robbieburns' }
let(:crop) { FactoryBot.create :crop }
before(:each) do
# time to harvest = 50 day
# time to finished = 90 days
@@ -98,6 +101,7 @@ feature "Gardens#index", :js do
garden: garden,
planted_at: Time.zone.today
end
it { expect(page).to have_link href: planting_path(planting) }
it { expect(page).to have_link href: garden_path(planting.garden) }
it { expect(page).to have_text '50 days until harvest' }
@@ -112,6 +116,7 @@ feature "Gardens#index", :js do
owner: member, garden: garden,
planted_at: 51.days.ago
end
it { expect(crop.median_days_to_first_harvest).to eq 50 }
it { expect(crop.median_lifespan).to eq 90 }
@@ -126,6 +131,7 @@ feature "Gardens#index", :js do
crop: crop, owner: member,
garden: garden, planted_at: 260.days.ago
end
it { expect(page).to have_text 'super late' }
it { expect(page).not_to have_text 'harvesting now' }
it { expect(page).not_to have_text 'days until harvest' }

View File

@@ -1,13 +1,16 @@
require 'rails_helper'
feature "browse harvests" do
subject { page }
let!(:member) { create :member }
let!(:harvest) { create :harvest, owner: member }
background { login_as member }
subject { page }
feature 'blank optional fields' do
let!(:harvest) { create :harvest, :no_description }
before { visit harvests_path }
scenario 'read more' do

View File

@@ -1,6 +1,8 @@
require 'rails_helper'
feature "home page" do
subject { page }
let(:member) { FactoryBot.create :member }
# let(:seed_photo) { FactoryBot.create :photo }
let(:photo) { FactoryBot.create :photo }
@@ -13,6 +15,7 @@ feature "home page" do
let!(:tradable_seed) { FactoryBot.create :tradable_seed, finished: false }
let!(:finished_seed) { FactoryBot.create :tradable_seed, finished: true }
let!(:untradable_seed) { FactoryBot.create :untradable_seed }
background do
# Add photos, so they can appear on home page
planting.photos << photo
@@ -20,7 +23,6 @@ feature "home page" do
harvest.photos << photo
end
subject { page }
before { visit root_path }
shared_examples 'shows seeds' do
@@ -55,12 +57,14 @@ feature "home page" do
it { is_expected.to have_text 'Some of our crops' }
it { is_expected.to have_link href: crop_path(crop) }
end
describe 'shows recently added crops' do
it { is_expected.to have_text 'Recently Added' }
it 'link to newest crops' do
is_expected.to have_link crop.name, href: crop_path(crop)
end
end
it 'includes a link to all crops' do
is_expected.to have_link 'View all crops'
end

View File

@@ -31,7 +31,7 @@ feature "Notifications", :js do
describe 'pagination' do
before do
34.times { FactoryBot.create :notification, recipient: recipient }
FactoryBot.create_list :notification, 34, recipient: recipient
login_as recipient
visit notifications_path
end

View File

@@ -7,6 +7,7 @@ feature "Seeds", :js do
visit seed_path(seed)
page
end
let(:member) { FactoryBot.create :member }
let!(:seed) { FactoryBot.create :seed, owner: member }
@@ -17,13 +18,16 @@ feature "Seeds", :js do
# end
context 'has one photo' do
before { seed.photos = [photo] }
let!(:photo) { FactoryBot.create :photo, title: 'hello photo' }
it { is_expected.to have_xpath("//img[contains(@src,'#{photo.thumbnail_url}')]") }
it { is_expected.to have_xpath("//a[contains(@href,'#{photo_path(photo)}')]") }
end
context 'has 50 photos' do
before { seed.photos = photos }
let!(:photos) { FactoryBot.create_list :photo, 50 }
it "shows newest photo" do

View File

@@ -1,11 +1,6 @@
require 'rails_helper'
describe ApplicationHelper do
it "formats prices" do
price_in_dollars(999).should eq '9.99'
price_with_currency(999).should eq format('9.99 %s', Growstuff::Application.config.currency)
end
it "parses dates" do
parse_date(nil).should eq nil
parse_date('').should eq nil
@@ -25,6 +20,7 @@ describe ApplicationHelper do
before :each do
@member = FactoryBot.build(:member, email: 'example@example.com', preferred_avatar_uri: nil)
end
it 'should render a gravatar uri' do
expect(avatar_uri(@member)).to eq 'http://www.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?size=150&default=identicon'
end
@@ -38,6 +34,7 @@ describe ApplicationHelper do
before :each do
@member = FactoryBot.build(:member, email: 'example@example.com', preferred_avatar_uri: 'http://media.catmoji.com/post/ujg/cat-in-hat.jpg')
end
it 'should render a the specified uri' do
expect(avatar_uri(@member)).to eq 'http://media.catmoji.com/post/ujg/cat-in-hat.jpg'
end
@@ -92,6 +89,7 @@ describe ApplicationHelper do
expect(build_alert_classes(:info)).not_to include ' alert-danger'
end
end
context 'warning' do
it 'works when :warning' do
expect(build_alert_classes(:warning)).to include 'alert-warning'
@@ -106,6 +104,7 @@ describe ApplicationHelper do
expect(build_alert_classes(:info)).not_to include ' alert-warning'
end
end
context 'success' do
it 'works when :notice' do
expect(build_alert_classes(:notice)).to include 'alert-success'
@@ -120,6 +119,7 @@ describe ApplicationHelper do
expect(build_alert_classes(:info)).not_to include ' alert-success'
end
end
context 'info' do
it 'works when :info' do
expect(build_alert_classes(:info)).to include 'alert-info'

View File

@@ -19,6 +19,7 @@ describe PhotosHelper do
describe "with a planting" do
before { planting.photos << planting_photo }
it "uses planting photos" do
is_expected.to eq planting_photo.thumbnail_url
end
@@ -26,6 +27,7 @@ describe PhotosHelper do
describe "with a harvest photos" do
before { harvest.photos << harvest_photo }
it "uses harvest photos" do
is_expected.to eq harvest_photo.thumbnail_url
end
@@ -33,6 +35,7 @@ describe PhotosHelper do
describe "uses seed photo" do
before { seed.photos << seed_photo }
it "uses seed photos" do
is_expected.to eq seed_photo.thumbnail_url
end
@@ -41,38 +44,46 @@ describe PhotosHelper do
describe "gardens" do
subject { garden_image_path(garden) }
it { is_expected.to eq 'placeholder_150.png' }
describe "uses garden's own photo" do
before { garden.photos << garden_photo }
it { is_expected.to eq garden_photo.thumbnail_url }
end
end
describe 'plantings' do
subject { planting_image_path(planting) }
it { is_expected.to eq 'placeholder_150.png' }
describe "uses planting's own photo" do
before { planting.photos << planting_photo }
it { is_expected.to eq planting_photo.thumbnail_url }
end
end
describe 'harvests' do
subject { harvest_image_path(harvest) }
it { is_expected.to eq 'placeholder_150.png' }
describe "uses harvest's own photo" do
before { harvest.photos << harvest_photo }
it { is_expected.to eq harvest_photo.thumbnail_url }
end
end
describe 'seeds' do
subject { seed_image_path(seed) }
it { is_expected.to eq 'placeholder_150.png' }
describe "uses seed's own photo" do
before { seed.photos << seed_photo }
it { is_expected.to eq seed_photo.thumbnail_url }
end
end

View File

@@ -142,6 +142,7 @@ describe Crop do
before :each do
@crop = FactoryBot.create(:tomato)
end
context 'with a planting photo' do
before :each do
@planting = FactoryBot.create(:planting, crop: @crop)
@@ -277,6 +278,7 @@ describe Crop do
context 'interesting' do
subject { Crop.interesting }
let(:photo) { FactoryBot.create :photo }
# first, a couple of candidate crops
let(:crop1) { FactoryBot.create(:crop) }
@@ -307,6 +309,7 @@ describe Crop do
# ... and photos
crop1_planting.photos = FactoryBot.create_list(:photo, 3)
end
it { is_expected.to include crop1 }
it { is_expected.not_to include crop2 }
it { expect(subject.size).to eq 1 }
@@ -321,6 +324,7 @@ describe Crop do
# but only crop1 has photos
crop1_planting.photos = FactoryBot.create_list(:photo, 3)
end
it { is_expected.to include crop1 }
it { is_expected.not_to include crop2 }
it { expect(subject.size).to eq 1 }

View File

@@ -274,9 +274,7 @@ describe 'member' do
@result = Member.interesting
# Some members have multiple plantings, but should only appear once
3.times do
FactoryBot.create(:planting, owner: @members[2])
end
FactoryBot.create_list(:planting, 3, owner: @members[2])
end
it 'finds interesting members without duplicates in the correct order' do
@@ -343,6 +341,7 @@ describe 'member' do
context 'queries a scope' do
before { member.destroy }
it { expect(Member.all).not_to include(member) }
it { expect(Member.confirmed).not_to include(member) }
it { expect(Member.located).not_to include(member) }
@@ -352,6 +351,7 @@ describe 'member' do
it { expect(Member.interesting).not_to include(member) }
it { expect(Member.has_plantings).not_to include(member) }
end
it "unsubscribes from mailing list" do
expect(member).to receive(:newsletter_unsubscribe).and_return(true)
member.destroy

View File

@@ -19,6 +19,7 @@ describe Planting do
it { expect(planting.days_since_planted).to eq(30) }
it { expect(planting.percentage_grown).to eq(nil) }
end
describe 'planting not planted yet' do
let(:planting) { FactoryBot.create :planting, planted_at: nil, finished_at: nil, finished: false }
@@ -27,6 +28,7 @@ describe Planting do
it { expect(planting.days_since_planted).to eq(nil) }
it { expect(planting.percentage_grown).to eq(nil) }
end
describe 'planting finished, no planted_at' do
let(:planting) { FactoryBot.create :planting, planted_at: nil, finished_at: 1.day.ago, finished: true }
@@ -35,6 +37,7 @@ describe Planting do
it { expect(planting.days_since_planted).to eq(nil) }
it { expect(planting.percentage_grown).to eq(100) }
end
describe 'planting all finished' do
let(:planting) { FactoryBot.create :planting, planted_at: 30.days.ago, finished_at: 1.day.ago, finished: true }
@@ -90,6 +93,7 @@ describe Planting do
describe 'planting finished 10 days, but was never planted' do
let(:planting) { FactoryBot.create :planting, planted_at: nil, finished_at: 10.days.ago }
it { expect(planting.percentage_grown).to eq 100 }
end
@@ -112,9 +116,11 @@ describe Planting do
it { expect(planting.days_to_last_harvest).to eq(nil) }
it { expect(planting.expected_lifespan).to eq(nil) }
end
context 'lots of data' do
let(:crop) { FactoryBot.create :crop }
# this is a method so it creates a new one each time
def one_hundred_day_old_planting
FactoryBot.create(:planting, crop: crop, planted_at: 100.days.ago)
end
@@ -133,33 +139,42 @@ describe Planting do
planting.crop.update_lifespan_medians
planting.crop.update_harvest_medians
end
it { expect(crop.median_days_to_first_harvest).to eq(20) }
describe 'sets median time to harvest' do
let(:planting) { FactoryBot.create :planting, crop: crop, planted_at: Time.zone.today }
it { expect(planting.first_harvest_predicted_at).to eq(Time.zone.today + 20.days) }
end
describe 'harvest still growing' do
let(:planting) { FactoryBot.create :planting, crop: crop, planted_at: Time.zone.today }
it { expect(planting.before_harvest_time?).to eq true }
it { expect(planting.harvest_time?).to eq false }
end
describe 'harvesting ready now' do
let(:planting) { FactoryBot.create :planting, crop: crop, planted_at: 21.days.ago }
it { expect(planting.first_harvest_predicted_at).to eq(1.day.ago.to_date) }
it { expect(planting.before_harvest_time?).to eq false }
it { expect(planting.harvest_time?).to eq true }
end
end
describe 'planting has no harvests' do
let(:planting) { FactoryBot.create :planting }
before do
planting.update_harvest_days!
planting.crop.update_harvest_medians
end
it { expect(planting.days_to_first_harvest).to eq(nil) }
it { expect(planting.days_to_last_harvest).to eq(nil) }
end
describe 'planting has first harvest' do
let(:planting) { FactoryBot.create :planting, planted_at: 100.days.ago }
@@ -171,11 +186,13 @@ describe Planting do
planting.update_harvest_days!
planting.crop.update_harvest_medians
end
it { expect(planting.days_to_first_harvest).to eq(90) }
it { expect(planting.days_to_last_harvest).to eq(nil) }
it { expect(planting.crop.median_days_to_first_harvest).to eq(90) }
it { expect(planting.crop.median_days_to_last_harvest).to eq(nil) }
end
describe 'planting has last harvest' do
let(:planting) { FactoryBot.create :planting, planted_at: 100.days.ago, finished_at: 1.day.ago, finished: true }
@@ -185,6 +202,7 @@ describe Planting do
planting.update_harvest_days!
planting.crop.update_harvest_medians
end
it { expect(planting.days_to_first_harvest).to eq(10) }
it { expect(planting.days_to_last_harvest).to eq(90) }
it { expect(planting.crop.median_days_to_first_harvest).to eq(10) }
@@ -463,6 +481,7 @@ describe Planting do
context 'ancestry' do
let(:parent_seed) { FactoryBot.create :seed }
let(:planting) { FactoryBot.create :planting, parent_seed: parent_seed }
it "planting has a parent seed" do
expect(planting.parent_seed).to eq(parent_seed)
end
@@ -471,6 +490,7 @@ describe Planting do
end
describe 'grandchildren' do
let(:grandchild_seed) { FactoryBot.create :seed, parent_planting: planting }
it { expect(grandchild_seed.parent_planting).to eq planting }
it { expect(grandchild_seed.parent_planting.parent_seed).to eq parent_seed }
end

View File

@@ -6,6 +6,7 @@ describe Role do
role.members << member
role
end
let(:member) { FactoryBot.create(:member) }
it 'has members' do

View File

@@ -153,6 +153,7 @@ describe Seed do
let(:seed) { FactoryBot.create :seed }
before { seed.photos << FactoryBot.create(:photo) }
it 'is found in has_photos scope' do
Seed.has_photos.should include(seed)
end
@@ -161,6 +162,7 @@ describe Seed do
context 'ancestry' do
let(:parent_planting) { FactoryBot.create :planting }
let(:seed) { FactoryBot.create :seed, parent_planting: parent_planting }
it "seed has a parent planting" do
expect(seed.parent_planting).to eq(parent_planting)
end
@@ -172,6 +174,7 @@ describe Seed do
context "finished" do
describe 'has finished fields' do
let(:seed) { FactoryBot.create(:finished_seed) }
it { expect(seed.finished).to eq true }
it { expect(seed.finished_at).to be_an_instance_of Date }
end

View File

@@ -2,6 +2,7 @@ require 'rails_helper'
RSpec.describe 'Plantings', type: :request do
subject { JSON.parse response.body }
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:crop) { FactoryBot.create :crop }
let(:crop_encoded_as_json_api) do
@@ -57,11 +58,13 @@ RSpec.describe 'Plantings', type: :request do
describe '#index' do
before { get '/api/v1/crops', {}, headers }
it { expect(subject['data']).to include(crop_encoded_as_json_api) }
end
describe '#show' do
before { get "/api/v1/crops/#{crop.id}", {}, headers }
it { expect(subject['data']['attributes']).to eq(attributes) }
it { expect(subject['data']['relationships']).to include("plantings" => plantings_as_json_api) }
it { expect(subject['data']['relationships']).to include("harvests" => harvests_as_json_api) }
@@ -72,16 +75,19 @@ RSpec.describe 'Plantings', type: :request do
describe '#create' do
before { post '/api/v1/crops', { 'crop' => { 'name' => 'can i make this' } }, headers }
it { expect(response.code).to eq "404" }
end
describe '#update' do
before { post "/api/v1/crops/#{crop.id}", { 'crop' => { 'name' => 'can i modify this' } }, headers }
it { expect(response.code).to eq "404" }
end
describe '#delete' do
before { delete "/api/v1/crops/#{crop.id}", {}, headers }
it { expect(response.code).to eq "404" }
end
end

View File

@@ -2,6 +2,7 @@ require 'rails_helper'
RSpec.describe 'Gardens', type: :request do
subject { JSON.parse response.body }
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:garden) { FactoryBot.create :garden }
let(:garden_encoded_as_json_api) do

View File

@@ -2,6 +2,7 @@ require 'rails_helper'
RSpec.describe 'Harvests', type: :request do
subject { JSON.parse response.body }
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:harvest) { FactoryBot.create :harvest }
let(:harvest_encoded_as_json_api) do
@@ -58,11 +59,13 @@ RSpec.describe 'Harvests', type: :request do
describe '#index' do
before { get '/api/v1/harvests', {}, headers }
it { expect(subject['data']).to include(harvest_encoded_as_json_api) }
end
describe '#show' do
before { get "/api/v1/harvests/#{harvest.id}", {}, headers }
it { expect(subject['data']['attributes']).to eq(attributes) }
it { expect(subject['data']['relationships']).to include("planting" => planting_as_json_api) }
it { expect(subject['data']['relationships']).to include("crop" => crop_as_json_api) }
@@ -73,16 +76,19 @@ RSpec.describe 'Harvests', type: :request do
describe '#create' do
before { post '/api/v1/harvests', { 'harvest' => { 'description' => 'can i make this' } }, headers }
it { expect(response.code).to eq "404" }
end
describe '#update' do
before { post "/api/v1/harvests/#{harvest.id}", { 'harvest' => { 'description' => 'can i modify this' } }, headers }
it { expect(response.code).to eq "404" }
end
describe '#delete' do
before { delete "/api/v1/harvests/#{harvest.id}", {}, headers }
it { expect(response.code).to eq "404" }
end
end

View File

@@ -2,6 +2,7 @@ require 'rails_helper'
RSpec.describe 'Members', type: :request do
subject { JSON.parse response.body }
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:member) { FactoryBot.create :member }
let(:member_encoded_as_json_api) do
@@ -58,11 +59,13 @@ RSpec.describe 'Members', type: :request do
describe '#index' do
before { get '/api/v1/members', {}, headers }
it { expect(subject['data']).to include(member_encoded_as_json_api) }
end
describe '#show' do
before { get "/api/v1/members/#{member.id}", {}, headers }
it { expect(subject['data']['relationships']).to include("gardens" => gardens_as_json_api) }
it { expect(subject['data']['relationships']).to include("plantings" => plantings_as_json_api) }
it { expect(subject['data']['relationships']).to include("seeds" => seeds_as_json_api) }
@@ -73,16 +76,19 @@ RSpec.describe 'Members', type: :request do
describe '#create' do
before { post '/api/v1/members', { 'member' => { 'login_name' => 'can i make this' } }, headers }
it { expect(response.code).to eq "404" }
end
describe '#update' do
before { post "/api/v1/members/#{member.id}", { 'member' => { 'login_name' => 'can i modify this' } }, headers }
it { expect(response.code).to eq "404" }
end
describe '#delete' do
before { delete "/api/v1/members/#{member.id}", {}, headers }
it { expect(response.code).to eq "404" }
end
end

View File

@@ -2,6 +2,7 @@ require 'rails_helper'
RSpec.describe 'Photos', type: :request do
subject { JSON.parse response.body }
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:photo) { FactoryBot.create :photo }
let(:photo_encoded_as_json_api) do
@@ -56,11 +57,13 @@ RSpec.describe 'Photos', type: :request do
describe '#index' do
before { get '/api/v1/photos', {}, headers }
it { expect(subject['data']).to include(photo_encoded_as_json_api) }
end
describe '#show' do
before { get "/api/v1/photos/#{photo.id}", {}, headers }
it { expect(subject['data']['attributes']).to eq(attributes) }
it { expect(subject['data']['relationships']).to include("plantings" => plantings_as_json_api) }
it { expect(subject['data']['relationships']).to include("harvests" => harvests_as_json_api) }
@@ -70,16 +73,19 @@ RSpec.describe 'Photos', type: :request do
describe '#create' do
before { post '/api/v1/photos', { 'photo' => { 'name' => 'can i make this' } }, headers }
it { expect(response.code).to eq "404" }
end
describe '#update' do
before { post "/api/v1/photos/#{photo.id}", { 'photo' => { 'name' => 'can i modify this' } }, headers }
it { expect(response.code).to eq "404" }
end
describe '#delete' do
before { delete "/api/v1/photos/#{photo.id}", {}, headers }
it { expect(response.code).to eq "404" }
end
end

View File

@@ -2,6 +2,7 @@ require 'rails_helper'
RSpec.describe 'Plantings', type: :request do
subject { JSON.parse response.body }
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:planting) { FactoryBot.create :planting }
let(:planting_encoded_as_json_api) do

View File

@@ -2,6 +2,7 @@ require 'rails_helper'
RSpec.describe 'Photos', type: :request do
subject { JSON.parse response.body }
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:seed) { FactoryBot.create :seed }
let(:seed_encoded_as_json_api) do
@@ -45,11 +46,13 @@ RSpec.describe 'Photos', type: :request do
describe '#index' do
before { get '/api/v1/seeds', {}, headers }
it { expect(subject['data']).to include(seed_encoded_as_json_api) }
end
describe '#show' do
before { get "/api/v1/seeds/#{seed.id}", {}, headers }
it { expect(subject['data']['attributes']).to eq(attributes) }
it { expect(subject['data']['relationships']).to include("owner" => owner_as_json_api) }
it { expect(subject['data']['relationships']).to include("crop" => crop_as_json_api) }
@@ -58,16 +61,19 @@ RSpec.describe 'Photos', type: :request do
describe '#create' do
before { post '/api/v1/seeds', { 'seed' => { 'name' => 'can i make this' } }, headers }
it { expect(response.code).to eq "404" }
end
describe '#update' do
before { post "/api/v1/seeds/#{seed.id}", { 'seed' => { 'name' => 'can i modify this' } }, headers }
it { expect(response.code).to eq "404" }
end
describe '#delete' do
before { delete "/api/v1/seeds/#{seed.id}", {}, headers }
it { expect(response.code).to eq "404" }
end
end

View File

@@ -2,6 +2,7 @@ require 'rails_helper'
describe "crops/_planting_advice" do
subject { rendered }
let(:planting) { FactoryBot.create(:planting) }
shared_examples "render planting_advice" do
@@ -18,6 +19,7 @@ describe "crops/_planting_advice" do
context "with sunniness frequencies" do
before { FactoryBot.create(:sunny_planting, crop: planting.crop) }
include_examples "render planting_advice"
it { is_expected.to have_content "Plant in:" }
it { is_expected.to have_content "sun (1)" }
@@ -28,6 +30,7 @@ describe "crops/_planting_advice" do
FactoryBot.create_list(:sunny_planting, 2, crop: planting.crop)
FactoryBot.create(:shady_planting, crop: planting.crop)
end
include_examples "render planting_advice"
it { is_expected.to have_content "Plant in:" }
it { is_expected.to have_content "sun (2), shade (1)" }
@@ -44,6 +47,7 @@ describe "crops/_planting_advice" do
context "with planted_from frequencies" do
before { FactoryBot.create(:seed_planting, crop: planting.crop) }
include_examples "render planting_advice"
it { is_expected.to have_content "Plant from:" }
it { is_expected.to have_content "seed (1)" }
@@ -54,6 +58,7 @@ describe "crops/_planting_advice" do
FactoryBot.create_list(:seed_planting, 2, crop: planting.crop)
FactoryBot.create(:cutting_planting, crop: planting.crop)
end
include_examples "render planting_advice"
it { is_expected.to have_content "Plant from:" }
it { is_expected.to have_content "seed (2), cutting (1)" }

View File

@@ -64,11 +64,13 @@ describe 'devise/registrations/edit.html.haml', type: "view" do
assert_select "a", "Connect to Twitter"
end
end
context 'connected to twitter' do
before(:each) do
@twitter_auth = FactoryBot.create(:authentication, member: @member)
render
end
it 'has a link to twitter profile' do
assert_select "a", href: "http://twitter.com/#{@twitter_auth.name}"
end
@@ -84,11 +86,13 @@ describe 'devise/registrations/edit.html.haml', type: "view" do
assert_select "a", "Connect to Flickr"
end
end
context 'connected to flickr' do
before(:each) do
@flickr_auth = FactoryBot.create(:flickr_authentication, member: @member)
render
end
it 'has a link to flickr photostream' do
assert_select "a", href: "http://flickr.com/photos/#{@flickr_auth.uid}"
end

View File

@@ -0,0 +1,42 @@
require 'rails_helper'
describe 'harvests/index.rss.haml' do
before(:each) do
controller.stub(:current_user) { nil }
@member = FactoryBot.create(:member)
@tomato = FactoryBot.create(:tomato)
@maize = FactoryBot.create(:maize)
@pp = FactoryBot.create(:plant_part)
page = 1
per_page = 2
total_entries = 2
harvests = WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
pager.replace([
FactoryBot.create(:harvest,
crop: @tomato,
owner: @member),
FactoryBot.create(:harvest,
crop: @maize,
plant_part: @pp,
owner: @member,
quantity: 2)
])
end
assign(:harvests, harvests)
render
end
it 'shows RSS feed title' do
rendered.should have_content "Recent harvests from all members"
end
it "displays crop's name in title" do
assign(:crop, @tomato)
render
expect(rendered).to have_content @tomato.name
end
it 'shows formatted content of harvest posts' do
expect(rendered).to have_content "<p>Quantity: "
end
end

View File

@@ -2,6 +2,7 @@ require 'rails_helper'
describe "harvests/show" do
subject { render }
let!(:harvest) { FactoryBot.create(:harvest) }
before do

View File

@@ -1,6 +1,8 @@
require 'rails_helper'
describe 'members/show.rss.haml', type: "view" do
subject { rendered }
before(:each) do
@member = assign(:member, FactoryBot.create(:member))
@post1 = FactoryBot.create(:post, id: 1, author: @member)
@@ -9,8 +11,6 @@ describe 'members/show.rss.haml', type: "view" do
render
end
subject { rendered }
it 'shows RSS feed title' do
is_expected.to match(/member\d+'s recent posts/)
end

View File

@@ -49,6 +49,7 @@ describe "photos/show" do
controller.stub(:current_user) { member }
render
end
include_examples "photo data renders"
it "has a delete button" do
@@ -61,6 +62,7 @@ describe "photos/show" do
controller.stub(:current_user) { FactoryBot.create :member }
render
end
include_examples "photo data renders"
include_examples "No links to change data"
end
@@ -70,6 +72,7 @@ describe "photos/show" do
controller.stub(:current_user) { nil }
render
end
include_examples "photo data renders"
include_examples "No links to change data"
end
@@ -84,6 +87,7 @@ describe "photos/show" do
@photo.gardens << garden
render
end
it "links to the CC license" do
assert_select "a", href: @photo.license_url,
text: @photo.license_name

View File

@@ -2,6 +2,7 @@ require 'rails_helper'
describe "posts/show" do
subject { rendered }
let(:author) { FactoryBot.create(:member) }
before(:each) do
@@ -11,6 +12,7 @@ describe "posts/show" do
describe 'render post' do
before { render }
describe "basic post" do
let(:post) { FactoryBot.create(:post, author: author) }
@@ -35,11 +37,13 @@ describe "posts/show" do
it { is_expected.to have_content('EVIL') }
it { is_expected.not_to have_link("http://evil.com") }
end
describe 'script tag in post body' do
let(:post) { FactoryBot.create(:post, author: author, body: "<script>alert('hakker!')</script>") }
it { is_expected.not_to have_selector('script') }
end
describe 'script tag in post title' do
let(:post) { FactoryBot.create(:post, author: author, subject: "<script>alert('hakker!')</script>") }
@@ -99,6 +103,7 @@ describe "posts/show" do
let(:post) { FactoryBot.create(:forum_post, author: author) }
before { render }
it "shows forum name" do
is_expected.to have_content "in #{post.forum.name}"
end