Miles Gould
71ec9fd2d3
Run JS tests from rake and rake spec:unit
2017-02-07 14:27:14 +00:00
Miles Gould
f11bc42507
Turn on asset compilation in test
...
This is required for running jasmine tests via `rake spec:javascript`.
The comment above this setting warned that it would slow down testing
considerably; in my quick tests the slowdown is only about 2% (3mins 14
vs 3mins 11). We precompile assets in Travis, so this *shouldn't* cause
any more random CI failures...
2017-02-07 14:27:14 +00:00
Miles Gould
7672b9ffc8
Add spec:unit Rake task
2017-02-07 14:27:14 +00:00
Miles Gould
8d237cc2ee
Make rake run specs and static checks by default
2017-02-07 14:27:14 +00:00
Miles Gould
a875a7c883
Cache asset-pipeline cache in Travis
...
This should shave about 30s off each job.
2017-02-07 14:27:14 +00:00
Miles Gould
19d65587be
Split static checks into a separate Travis job
2017-02-07 14:27:14 +00:00
Miles Gould
3fed962dcc
Add script/check_static to run all static checks
...
...and invoke it from .travis.yml
2017-02-07 14:27:14 +00:00
Miles Gould
987f50c87e
Factor out global env vars in .travis.yml
...
This should make it slightly more obvious which job is which when
looking at Travis build results.
2017-02-07 13:52:23 +00:00
Daniel O'Connor
bba057ec76
Merge pull request #1192 from Br3nda/bw/three-pending-specs
...
Filled in the 3 pending planting specs
2017-02-07 16:36:59 +10:30
Brenda Wallace
1dc44c9edc
Filled in the 3 pending planting specs
2017-02-07 18:29:10 +13:00
Daniel O'Connor
92c1515381
Merge pull request #1186 from CloCkWeRX/fix_date_expectation
...
Fix #1182 and improve test coverage
2017-02-07 14:02:31 +10:30
Shiny
43f905ea25
Merge branch 'dev' into fix_date_expectation
2017-02-07 16:03:39 +13:00
Brenda Wallace
1db30d98ce
Haml clean up for members
2017-02-07 15:35:34 +13:00
Shiny
2b92f013fc
Merge branch 'dev' into fix_date_expectation
2017-02-07 14:34:41 +13:00
Brenda Wallace
23f8c24ef4
Haml clean up for notifications
2017-02-07 14:33:20 +13:00
Daniel O'Connor
fba2306a4d
Merge pull request #1190 from Br3nda/bw/haml-shop
...
Haml clean for shop
2017-02-07 11:15:26 +10:30
Brenda Wallace
c8fa54591a
Haml clean for shop
2017-02-07 07:53:34 +13:00
Daniel O'Connor
67b496fe44
Merge pull request #1185 from Br3nda/bw/grand-haml-cleanup-of-2017
...
Forums and Gardens haml clean up
2017-02-06 14:13:27 +10:30
Daniel O'Connor
b24514fa82
Look at right attribute
2017-02-06 14:11:44 +10:30
Daniel O'Connor
f0a81d4100
Fix #1182 and improve test coverage
2017-02-06 14:10:40 +10:30
Brenda Wallace
64f11793c9
Fixed typo in link
2017-02-06 16:31:57 +13:00
Brenda Wallace
05a9d498a7
More forums haml clean up
2017-02-06 14:50:49 +13:00
Brenda Wallace
16145599ce
Haml clean up for (most) garden views
2017-02-06 14:46:19 +13:00
Brenda Wallace
af8527aa5b
Haml clean up of forum views
2017-02-06 14:46:19 +13:00
Daniel O'Connor
f9eb70e2eb
Merge pull request #1184 from Br3nda/bw/grand-haml-cleanup-of-2017
...
Haml clean up -- crops views
2017-02-06 11:47:47 +10:30
Brenda Wallace
8408fdc845
Moved popular plant plarts calculation into sql
2017-02-06 13:22:18 +13:00
Brenda Wallace
f37c9152af
Simplified the "grown for" view
2017-02-06 11:21:33 +13:00
Brenda Wallace
4ee789ca06
Popular plant parts are now sorted by popularity
2017-02-06 10:59:40 +13:00
Brenda Wallace
43e4ed43cd
Travis starts checking the haml that's cleaned up
...
To stop regressions to bad haml again
2017-02-06 10:46:49 +13:00
Brenda Wallace
80371c835c
Moved long line (ebay url) to helper
2017-02-06 10:40:58 +13:00
Brenda Wallace
6478d9cb1b
Haml clean up for crops views
2017-02-06 10:31:45 +13:00
pozorvlak
f8b84f390d
Calculate "count_uses_of_property" using DB query ( #1183 )
...
* Refactor 'count_uses_of_property' method in crop model
* Add check for nil column value
* Add @alran to CONTRIBUTORS.md
* Reformat Crop#count_uses_of_property
* Remove unnecessary string interpolation
2017-02-05 13:23:47 +13:00
pozorvlak
755b9b339f
Merge pull request #1181 from Br3nda/bw/grand-haml-cleanup-of-2017
...
Te grand haml cleanup of 2017
2017-02-04 23:07:12 +00:00
Shiny
9deed09d36
Merge branch 'dev' into bw/grand-haml-cleanup-of-2017
2017-02-05 11:01:46 +13:00
pozorvlak
43de722faf
Merge pull request #1180 from Br3nda/bw/application-controller-complexity
...
Reduce complexity of ApplicationController.store_location
2017-02-04 21:55:51 +00:00
pozorvlak
e145bb59f7
Merge branch 'dev' into bw/application-controller-complexity
2017-02-04 21:45:06 +00:00
pozorvlak
911c7b7bc1
Merge pull request #1174 from Br3nda/bw/rubocop-reduce-complexity
...
rubocop - reduce complexity
2017-02-04 21:44:42 +00:00
Brenda Wallace
2b7144c1fd
Fixed trailing quote in haml
2017-02-04 15:07:18 +13:00
Brenda Wallace
8ddf36fed9
Haml clean up for (some of) crops views
2017-02-04 15:04:07 +13:00
Brenda Wallace
785ae33a42
Haml clean up for comments views
2017-02-04 14:07:59 +13:00
Brenda Wallace
c43c1686a3
Haml clean up for alternate_names views
2017-02-04 13:50:04 +13:00
Brenda Wallace
65a8bde467
Haml clean up for admin views
2017-02-04 12:00:42 +13:00
Brenda Wallace
3647f67538
Haml clean up for accounts views
2017-02-04 11:52:15 +13:00
Brenda Wallace
6c4f7eff92
Haml clean up for account_types views
2017-02-04 11:50:33 +13:00
Brenda Wallace
9b57a44f6c
Adding haml-lint
2017-02-04 11:41:02 +13:00
Brenda Wallace
8a69ed4013
Reduce complexity of ApplicationController.store_location
2017-02-04 11:31:34 +13:00
Brenda Wallace
e5d826e8c3
Further simplified newsletter subscription logic
2017-02-04 11:28:37 +13:00
Brenda Wallace
77c01d4f66
BUGFIX: Added missing if
2017-02-04 11:23:27 +13:00
Brenda Wallace
33b7952ed3
Simplified OmniauthCallbacksController
2017-02-04 11:21:15 +13:00
Brenda Wallace
1217ba5b48
Reduce complexity of ApplicationController.store_location
2017-02-04 11:19:11 +13:00
