Brenda Wallace
1dc44c9edc
Filled in the 3 pending planting specs
2017-02-07 18:29:10 +13:00
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
8408fdc845
Moved popular plant plarts calculation into sql
2017-02-06 13:22:18 +13:00
Brenda Wallace
7ba9049908
spec only show active gardens
2017-02-01 18:25:56 +13:00
Brenda Wallace
c82127f1fb
Modify specs for new titles on garden nav buttons
2017-02-01 17:37:03 +13:00
Daniel O'Connor
15106a051c
Merge branch 'dev' into likeable
2017-01-27 12:05:13 +10:30
Daniel O'Connor
43519809f5
Merge branch 'dev' into bw/bar_graphs
2017-01-27 11:54:12 +10:30
Shiny
7731623397
Merge branch 'dev' into likeable
2017-01-27 14:21:53 +13:00
Brenda Wallace
65b4b2d23e
Feature spec for requested crops
2017-01-23 09:49:47 +13:00
Shiny
d6de147661
Merge branch 'dev' into bw/bar_graphs
2017-01-22 18:39:53 +13:00
Brenda Wallace
ff50ec65d0
Merge remote-tracking branch 'upstream/dev' into HEAD
2017-01-22 18:26:29 +13:00
Brenda Wallace
40a981c94d
Removed unnecesary braces on hash args
2017-01-22 15:10:11 +13:00
Shiny
714b2580a3
Merge branch 'dev' into bw/bar_graphs
2017-01-18 11:15:09 +13:00
pozorvlak
cc59c4f49b
Merge branch 'dev' into bw/rubocop
2017-01-17 16:47:07 +00:00
Shiny
f8dda12de6
Merge branch 'dev' into bw/active-plantings
2017-01-15 17:36:32 +13:00
Shiny
ab332976da
Merge branch 'dev' into bw/rubocop
2017-01-15 17:36:17 +13:00
Brenda Wallace
0fa9f54c9c
Rename member.has_role? to role?
2017-01-14 20:54:43 +13:00
Brenda Wallace
f214f608ff
Rename member.is_paid? to paid?
2017-01-14 20:51:22 +13:00
Brenda Wallace
405dfe4bc9
Merge remote-tracking branch 'upstream/dev' into bw/description-photo-links
2017-01-08 21:35:59 +13:00
Shiny
15de4ac08c
Merge branch 'dev' into bw/active-plantings
2017-01-08 11:16:19 +13:00
Shiny
6e535f2403
Merge branch 'dev' into bw/bar_graphs
2017-01-08 11:10:21 +13:00
Brenda Wallace
2f38a8585b
Revert "update spec for stringify"
...
This reverts commit 144823bd13
2017-01-07 13:50:11 +13:00
Brenda Wallace
144823bd13
update spec for stringify
2017-01-07 12:52:47 +13:00
Brenda Wallace
5b633b484b
Fixes link to seeds, and spec for link to seeds
2017-01-07 12:22:28 +13:00
Brenda Wallace
3be379cee9
updated specs to match new links on photo page
2017-01-07 12:05:35 +13:00
Miles Gould
885c9433ce
Merge branch 'dev' into bw/bar_graphs
2017-01-05 11:39:10 +00:00
Miles Gould
8083ae9052
Remove duplicate getBarValues() methods
...
I've replaced one with a getMaxValue() function, which is what we
actually want, and deleted the other.
2017-01-05 11:18:51 +00:00
Shiny
5ca8829727
Merge branch 'dev' into bw/active-plantings
2017-01-05 16:35:39 +13:00
Shiny
d40eccdb63
Merge branch 'dev' into bw/harvests-linkto-plantings
2017-01-05 16:31:22 +13:00
Shiny
fc71cba6ba
Merge branch 'dev' into bw/harvests-linkto-plantings
2017-01-04 22:52:54 +13:00
Brenda Wallace
283bb76a9e
Link a harvest to a planting, and display
2017-01-04 22:45:49 +13:00
Brenda Wallace
18e58809c3
Merge remote-tracking branch 'upstream/dev' into bw/active-plantings
2017-01-04 16:25:44 +13:00
Brenda Wallace
b27b361e2f
Show active plantings by default
2017-01-04 16:25:19 +13:00
Shiny
3fafa87afd
Merge branch 'dev' into bw/garden-specs
2017-01-04 16:18:54 +13:00
Brenda Wallace
8047aef692
Merge remote-tracking branch 'upstream/dev' into bw/descriptive-spec
...
Conflicts:
spec/features/signin_spec.rb
2017-01-03 22:16:24 +13:00
Brenda Wallace
b38728c5df
Add login() to signin spec to reduce code duplication
2017-01-03 22:13:27 +13:00
Brenda Wallace
241c3cfdc0
Moves model name into spec description
...
so we can tell which failed.
2017-01-03 22:12:23 +13:00
Brenda Wallace
ab75f830fb
Controller garden specs for member doing what they shouldn't
2016-12-25 10:38:07 +13:00
Shiny
0c8345d1e2
Merge branch 'dev' into bw/bar_graphs
2016-12-22 10:22:29 +13:00
Shiny
ee7fbb9ab9
Merge branch 'dev' into bw/guard-clauses
2016-12-21 20:53:47 +13:00
Miles Gould
4b1cdc5650
Test Model.newsletter_(un)subscribe
...
I'm not very happy with this change as-is. The tests are very shallow
(they wouldn't have caught the bug @tconquest and I found in this code,
for instance), and use the deprecated `receive_message_chain` method.
From the RSpec docs:
"Chains can be arbitrarily long, which makes it quite painless to
violate the Law of Demeter in violent ways, so you should consider any
use of receive_message_chain a code smell. Even though not all code
smells indicate real problems (think fluent interfaces),
receive_message_chain still results in brittle examples. For example, if
you write allow(foo).to receive_message_chain(:bar, :baz => 37) in a
spec and then the implementation calls foo.baz.bar, the stub will not
work."
Further work needed.
2016-12-19 22:15:53 +00:00
Miles Gould
4f1c94bfb9
Fix warnings in member_spec
2016-12-19 20:44:18 +00:00
Miles Gould
70f589d59b
Replace instance vars with locals in member_spec
2016-12-19 20:33:43 +00:00
Miles Gould
f5eede6072
Improve tests for Member.interesting
2016-12-19 20:29:05 +00:00
Miles Gould
3469d6d37f
Feature test for signin via email address
2016-12-19 20:23:07 +00:00
Miles Gould
abb9acd04a
post_spec: fix warnings
...
Several "unused variable" warnings (due to replacing unused instance
variables with unused locals) and one warning about ambiguous
lack-of-brackets.
2016-12-19 16:40:05 +00:00
Miles Gould
67faa5554c
post_spec: replace instance vars with local vars
...
The @ in front of a variable makes it an instance variable of the
surrounding object. There's no point doing that for variables that are
only used in a single function, so I've made such variables in the file
post_spec.rb into function-local variables. We should do this more
generally: there are a lot of instances of this (anti?)pattern in our
test suite.
2016-12-19 16:36:46 +00:00
Miles Gould
59b86c9b0c
Replace << with string-interpolation in post_spec
2016-12-19 16:33:41 +00:00
Miles Gould
7239cf068b
Test [member name](member) mention syntax
2016-12-19 16:31:32 +00:00
