Compare commits

...

35 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
Brenda Wallace
a9d463e9be Merge branch 'dev' into dependabot/bundler/rubyzip-1.2.2 2018-09-11 08:06:59 +12: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
6 changed files with 25 additions and 26 deletions

View File

@@ -85,10 +85,11 @@ submit the change with your pull request.
- 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 / [deppbot](https://github.com/deppbot)
- dependabot[bot] / [dependabot-bot](https://github.com/dependabot-bot)
- dependabot[bot] / [dependabot-bot] / [dependabot] (https://github.com/dependabot-bot)
- dependabot / [dependabot](https://github.com/dependabot)

View File

@@ -53,7 +53,7 @@ GEM
ast (2.4.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)
@@ -90,7 +90,7 @@ GEM
capybara-screenshot (1.0.21)
capybara (>= 1.0, < 4)
launchy
chartkick (2.3.5)
chartkick (3.0.1)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
climate_control (0.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)
@@ -163,10 +163,10 @@ GEM
erubis (2.7.0)
excon (0.62.0)
execjs (2.7.0)
factory_bot (4.10.0)
factory_bot (4.11.1)
activesupport (>= 3.0.0)
factory_bot_rails (4.10.0)
factory_bot (~> 4.10.0)
factory_bot_rails (4.11.1)
factory_bot (~> 4.11.1)
railties (>= 3.0.0)
faker (1.9.1)
i18n (>= 0.7)
@@ -176,7 +176,7 @@ GEM
figaro (1.1.1)
thor (~> 0.14)
flickraw (0.9.9)
font-awesome-sass (5.0.13)
font-awesome-sass (5.4.1)
sassc (>= 1.11)
formatador (0.2.5)
friendly_id (5.2.4)
@@ -310,8 +310,8 @@ GEM
multi_xml (0.6.0)
multipart-post (2.0.0)
nenv (0.3.0)
newrelic_rpm (5.2.0.345)
nokogiri (1.8.4)
newrelic_rpm (5.4.0.347)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
notiffany (0.1.1)
nenv (~> 0.1)
@@ -413,7 +413,7 @@ 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)
@@ -421,7 +421,7 @@ GEM
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-activemodel-mocks (1.0.3)
rspec-activemodel-mocks (1.1.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
rspec-mocks (>= 2.99, < 4.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,17 +466,16 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (1.12.0)
sassc (2.0.0)
ffi (~> 1.9.6)
sass (>= 3.3.0)
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)

View File

@@ -9,9 +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" }

View File

@@ -113,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

View File

@@ -23,7 +23,6 @@ feature "home page" do
harvest.photos << photo
end
before { visit root_path }
shared_examples 'shows seeds' do

View File

@@ -11,7 +11,6 @@ describe 'members/show.rss.haml', type: "view" do
render
end
it 'shows RSS feed title' do
is_expected.to match(/member\d+'s recent posts/)
end