Brenda Wallace
096146cb84
Fix: @owner -> owner in harvests_title
2017-02-08 07:25:59 +13:00
Brenda Wallace
ba1c40702b
DRY up gardens and plantings helper
2017-02-08 07:25:59 +13:00
Brenda Wallace
e6254da3f1
Haml clean up for Roles views
2017-02-08 07:25:59 +13:00
Brenda Wallace
acbb610e05
Haml clean up for posts views
2017-02-08 07:25:59 +13:00
Brenda Wallace
338265d9e9
Haml cleanup for plantings views
2017-02-08 07:25:59 +13:00
Brenda Wallace
706922cacf
Haml clean up for plantparts views
2017-02-08 07:25:59 +13:00
Brenda Wallace
08f2877f8e
Haml clean up for places views
2017-02-08 07:25:59 +13:00
Brenda Wallace
8275f5be96
Add photos to travis haml check
2017-02-08 07:25:59 +13:00
Brenda Wallace
2c3d1848d5
Haml clean up for photos
2017-02-08 07:25:59 +13:00
Brenda Wallace
17e88778c8
Haml clean up for orders
2017-02-08 07:25:59 +13:00
Brenda Wallace
bafb0123da
Haml cleanup for notifier
2017-02-08 07:25:59 +13:00
Brenda Wallace
e1e9c32652
Moved havests#index title to a helper
2017-02-08 07:25:59 +13:00
Brenda Wallace
48c3cbb3d1
Change to hash attributes syntax in harvests#show
2017-02-08 07:25:59 +13:00
Brenda Wallace
740b8587f2
Moved complex parts of garden/nav into helper
2017-02-08 07:25:59 +13:00
Brenda Wallace
b113146aaa
Add harvest and gardens to travis for haml-lint
2017-02-08 07:25:59 +13:00
Brenda Wallace
900de8a615
Fixed Read more link in harvests
2017-02-08 07:25:59 +13:00
Brenda Wallace
d73aa98309
Cleaned up most of Home's haml
2017-02-08 07:25:59 +13:00
Brenda Wallace
ac7d44cb72
Cleaned up most of harvest's haml
2017-02-08 07:25:59 +13:00
Miles Gould
d301f2f2ae
Add static check for files with merge conflicts
...
Fixes #1146
2017-02-07 15:03:52 +00:00
Miles Gould
2accb727e5
Describe rake static
2017-02-07 14:38:04 +00:00
Miles Gould
16db285898
Only run ES tests under GROWSTUFF_ELASTICSEARCH
...
And vice-versa: only run non-ElasticSearch tests under
GROWSTUFF_ELASTICSEARCH=false
2017-02-07 14:27:14 +00:00
Miles Gould
b8c0882642
Tag ElasticSearch-related tests
2017-02-07 14:27:14 +00:00
Miles Gould
cc54dc54b4
Only build ElasticSearch index for ES tests
2017-02-07 14:27:14 +00:00
Miles Gould
3f8ebdc477
Run JavaScript unit tests from Travis
...
`rspec spec` doesn't run the Jasmine tests, annoyingly, so I've added a
call to `rake jasmine:ci`.
2017-02-07 14:27:14 +00:00
Miles Gould
68120c5bbe
Make rake spec depend on rake assets:precompile
2017-02-07 14:27:14 +00:00
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