Commit Graph
13034 Commits
Author SHA1 Message Date
Cesy ca553a4693 Merge pull request #1130 from Growstuff/dev
Release 17
release17
2016-12-21 19:19:47 +00:00
Shiny 58ddeefaa3 Merge pull request #1127 from Br3nda/bw/guard-clauses
Guard clauses
2016-12-21 22:53:06 +13:00
Shiny ee7fbb9ab9 Merge branch 'dev' into bw/guard-clauses 2016-12-21 20:53:47 +13:00
pozorvlak cf31e53303 Merge pull request #1131 from pozorvlak/moar_tests
Improve unit test coverage for models
2016-12-20 14:22:36 +00: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 b8385afb2f Remove apparently-unused Geocodable.geocode method
We have unit tests for geocoding, but it's not being covered, so I
assume it's being shadowed by a method installed directly from Geocoder.
2016-12-19 20:14:05 +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
Miles Gould c23e80b56d Test Post.recently_active 2016-12-19 16:26:17 +00:00
Miles Gould b011fc9bae Test Post.comment_count 2016-12-19 16:17:31 +00:00
Miles Gould b40974d4c3 Test Crop.create_from_csv with missing parent
I couldn't work out how to test that the error is logged.
2016-12-19 16:15:19 +00:00
Shiny ed081e7286 Merge branch 'dev' into bw/guard-clauses 2016-12-18 19:29:05 +13:00
Cesy 1b9a5bc115 Merge pull request #1129 from Br3nda/bw/ruby-upgrade-2-3-3
Upgrade to ruby 2.3.3
2016-12-17 09:59:22 +00:00
Brenda Wallace b0dd53eb63 Upgrade to ruby 2.3.3 2016-12-17 20:32:07 +13:00
Shiny 27520e9aa6 Merge branch 'dev' into bw/bar_graphs 2016-12-16 12:52:16 +13:00
Daniel O'Connor 3cdaa03e5d Merge branch 'dev' into likeable 2016-12-15 14:28:22 +10:30
Brenda Wallace ebae0dfad3 Merge remote-tracking branch 'upstream/dev' into bw/guard-clauses 2016-12-14 21:37:12 +00:00
Brenda Wallace ca7868b79a Use guard clauses 2016-12-14 21:28:35 +00:00
Daniel O'Connor 148dfa7f8b Merge pull request #1126 from CloCkWeRX/2016-12-gem-upgrades
2016 12 gem upgrades
2016-12-13 15:08:46 +10:30
Daniel O'Connor feff2cdfd4 Upgrade rake only 2016-12-12 10:38:31 +10:30
Daniel O'Connor 74657abec0 Revert "Update rake and rubocop"
This reverts commit c9127dbf1e.
2016-12-12 10:37:45 +10:30
Daniel O'Connor 6ff3fa21e1 Revert "Disable Style/EmptyMethod for now"
This reverts commit 5235b11905.
2016-12-12 10:37:26 +10:30
Shiny fe5a93160f Merge branch 'dev' into bw/bar_graphs 2016-12-10 21:39:11 +13:00
Daniel O'Connor 88ba4f9198 Rubocop 2016-12-09 12:19:38 +10:30
Daniel O'Connor 2594e5d334 Rubocop 2016-12-09 12:06:14 +10:30
Daniel O'Connor ce9fc85d0b Rubocop 2016-12-09 12:04:13 +10:30
Daniel O'Connor 2499db77f1 Rubocop 2016-12-09 11:59:56 +10:30
Daniel O'Connor 8edbef3965 Rubocop 2016-12-09 11:56:53 +10:30
Daniel O'Connor 2e23675425 app/controllers/likes_controller.rb:2:3: C: Rails/ActionFilter: Prefer before_action over before_filter. 2016-12-09 11:52:46 +10:30
Daniel O'Connor fef272e30f Merge remote-tracking branch 'upstream/dev' into likeable 2016-12-09 11:42:32 +10:30
Daniel O'Connor be572b9a53 Upgrade 2016-12-09 11:25:03 +10:30
Daniel O'Connor 5235b11905 Disable Style/EmptyMethod for now 2016-12-09 11:17:54 +10:30
Daniel O'Connor d3d3731fa3 Update minitest 2016-12-09 10:52:01 +10:30
Daniel O'Connor 1982dc76be Pin to elasticsearch API 2.0 for now 2016-12-09 10:51:13 +10:30
Daniel O'Connor c9127dbf1e Update rake and rubocop 2016-12-09 10:46:22 +10:30
Daniel O'Connor f7ca706e0b Update omniauth-facebook (not as scary as it sounds - https://github.com/mkdynamic/omniauth-facebook/blob/master/CHANGELOG.md) 2016-12-09 10:25:08 +10:30
Daniel O'Connor 817c1ec5ce Update will_paginate 2016-12-09 10:24:18 +10:30
Daniel O'Connor 18ab47eed3 Update thor 2016-12-09 10:23:24 +10:30
Daniel O'Connor d99f24c02c Update coffee-script-source 2016-12-09 10:22:32 +10:30
Daniel O'Connor aaaca81d49 Update hashie 2016-12-09 10:21:31 +10:30
Daniel O'Connor 59ec36320b Update codeclimate-test-reporter 2016-12-09 10:20:47 +10:30
Daniel O'Connor 303fd8c243 Update autoprefixer-rails 2016-12-09 10:20:09 +10:30
Daniel O'Connor 3e43a19e58 Update CONTRIBUTING.md
Dead link, no archived version of it
2016-12-09 10:09:04 +10:30
Shiny 391d5bed5f Merge branch 'dev' into bw/bar_graphs 2016-12-09 07:29:55 +13:00