Merge 70db3c0c18 into 666f5ab2dc

.rubocop_todo.yml

@@ -723,9 +723,10 @@ Style/TrailingCommaInLiteral:
     - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
     - 'spec/models/conference_spec.rb'
 
-# Offense count: 3
+# Offense count: 2
-# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/UnneededInterpolation:
+# SupportedStyles: snake_case, normalcase, non_integer
+Style/VariableNumber:
   Exclude:
-    - 'app/helpers/format_helper.rb'
+    - 'spec/models/ticket_purchase_spec.rb'
-    - 'spec/controllers/admin/conferences_controller_spec.rb'
+

app/helpers/format_helper.rb

@@ -122,7 +122,7 @@ module FormatHelper
              plural || singular.pluralize
            end
 
-    "#{word}"
+    word.to_s
   end
 
   # Returns black or white deppending on what of them contrast more with the

spec/controllers/admin/conferences_controller_spec.rb

@@ -56,8 +56,8 @@ describe Admin::ConferencesController do
           conference.reload
           expect(flash[:error])
               .to eq("Updating conference failed. Short title can't be blank.")
-          expect(conference.title).to eq("#{conference.title}")
+          expect(conference.title).to eq(conference.title.to_s)
-          expect(conference.short_title).to eq("#{conference.short_title}")
+          expect(conference.short_title).to eq(conference.short_title.to_s)
         end
 
         it 're-renders the #show template' do