consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3706 from consul/dependabot/bundler/rubocop-rspec-1.35.0

Browse Source
This commit is contained in:
dependabot-preview[bot]
2019-09-19 15:03:06 +00:00
committed by GitHub
parent 27702e89a0 766f82a576
commit dde9caf7fd
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -97,7 +97,7 @@ group :development do
gem "erb_lint", require: false gem "erb_lint", require: false
gem "mdl", "~> 0.5.0", require: false gem "mdl", "~> 0.5.0", require: false
gem "rubocop", "~> 0.60.0", require: false gem "rubocop", "~> 0.60.0", require: false
gem "rubocop-rspec", "~> 1.33.0", require: false gem "rubocop-rspec", "~> 1.35.0", require: false
gem "rvm1-capistrano3", "~> 1.4.0", require: false gem "rvm1-capistrano3", "~> 1.4.0", require: false
gem "scss_lint", "~> 0.55.0", require: false gem "scss_lint", "~> 0.55.0", require: false
gem "web-console", "~> 3.3.0" gem "web-console", "~> 3.3.0"

6
Gemfile.lock
View File

@@ -276,7 +276,7 @@ GEM
railties (>= 3.1, < 6.0) railties (>= 3.1, < 6.0)
invisible_captcha (0.10.0) invisible_captcha (0.10.0)
rails (>= 3.2.0) rails (>= 3.2.0)
jaro_winkler (1.5.2) jaro_winkler (1.5.3)
jquery-fileupload-rails (0.4.7) jquery-fileupload-rails (0.4.7)
actionpack (>= 3.1) actionpack (>= 3.1)
railties (>= 3.1) railties (>= 3.1)
@@ -468,7 +468,7 @@ GEM
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0) unicode-display_width (~> 1.4.0)
rubocop-rspec (1.33.0) rubocop-rspec (1.35.0)
rubocop (>= 0.60.0) rubocop (>= 0.60.0)
ruby-progressbar (1.10.1) ruby-progressbar (1.10.1)
rubyzip (1.2.2) rubyzip (1.2.2)
@@ -649,7 +649,7 @@ DEPENDENCIES
rollbar (~> 2.18.0) rollbar (~> 2.18.0)
rspec-rails (~> 3.8) rspec-rails (~> 3.8)
rubocop (~> 0.60.0) rubocop (~> 0.60.0)
rubocop-rspec (~> 1.33.0) rubocop-rspec (~> 1.35.0)
rvm1-capistrano3 (~> 1.4.0) rvm1-capistrano3 (~> 1.4.0)
sass-rails (~> 5.0, >= 5.0.4) sass-rails (~> 5.0, >= 5.0.4)
savon (~> 2.12.0) savon (~> 2.12.0)

3
spec/models/budget/investment_spec.rb
View File

@@ -554,8 +554,7 @@ describe Budget::Investment do
expect(described_class.sort_by_title.map(&:title)).to eq %w[CCCC DDDD] expect(described_class.sort_by_title.map(&:title)).to eq %w[CCCC DDDD]
end end
it "should take into consideration title fallbacks when there is no it "takes into consideration title fallbacks when there is no translation for current locale" do
translation for current locale" do
create(:budget_investment, title: "BBBB") create(:budget_investment, title: "BBBB")
Globalize.with_locale(:es) do Globalize.with_locale(:es) do
I18n.with_locale(:es) do I18n.with_locale(:es) do