Merge pull request #115 from digitaltom/dependabot/bundler/rubocop-ra…

…ils-2.4.0 Bump rubocop-rails from 2.3.2 to 2.4.0
digitaltom · Dec 2, 2019 · a4da6d0 · a4da6d0
2 parents 53e07e4 + 9d7cdc2
commit a4da6d0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -188,7 +188,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rails (2.3.2)
+    rubocop-rails (2.4.0)
       rack (>= 1.1)
       rubocop (>= 0.72.0)
     ruby-progressbar (1.10.1)

diff --git a/app/models/picture_set.rb b/app/models/picture_set.rb
@@ -6,7 +6,7 @@ class PictureSet
   POLAROID_SUFFIX = '_polaroid.png'
   ANIMATION_SUFFIX = '_animation.gif'
   COMBINED_SUFFIX = '_combined.jpg'
-  PICTURE_PATH = Rails.root.join('public', 'picture_sets').to_s
+  PICTURE_PATH = Rails.root.join('public/picture_sets').to_s
 
   attr_accessor :date, :dir, :animation, :combined, :pictures, :next, :last
 

diff --git a/config/initializers/gpio.rb b/config/initializers/gpio.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Output
+# rubocop:disable Rails/Output
 # rubocop:disable Lint/RescueException
 begin
   $VERBOSE = nil
@@ -13,5 +13,5 @@
 ensure
   $VERBOSE = false
 end
-# rubocop:enable Output
+# rubocop:enable Rails/Output
 # rubocop:enable Lint/RescueException
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Where the I18n library should search for translation files
-I18n.load_path += Dir[Rails.root.join('config', 'locales', '*.{rb,yml}')]
+I18n.load_path += Dir[Rails.root.join('config/locales/*.{rb,yml}')]
 
 # Whitelist locales available for the application
 I18n.available_locales = %i[en de]

diff --git a/spec/models/picture_set_spec.rb b/spec/models/picture_set_spec.rb
@@ -2,11 +2,11 @@
 
 require 'rails_helper'
 
-# rubocop:disable BlockLength
+# rubocop:disable Metrics/BlockLength
 RSpec.describe PictureSet, type: :model do
 
   before do
-    stub_const('PictureSet::PICTURE_PATH', Rails.root.join('spec', 'fixtures', 'filesystem'))
+    stub_const('PictureSet::PICTURE_PATH', Rails.root.join('spec/fixtures/filesystem'))
   end
 
   describe '#all' do
@@ -126,4 +126,4 @@
   end
 
 end
-# rubocop:enable BlockLength
+# rubocop:enable Metrics/BlockLength