exclude config/ from rubocop styling, more style fixes

This commit is contained in:
Stella Rouzi 2014-08-19 20:14:27 +03:00
parent b7c45718d8
commit da061b3902
5 changed files with 4 additions and 4 deletions

View file

@ -128,3 +128,4 @@ AllCops:
- 'db/schema.rb' - 'db/schema.rb'
- 'vendor/bundle/**/*' - 'vendor/bundle/**/*'
- 'bundle/**/*' - 'bundle/**/*'
- 'config/**/*'

View file

@ -36,7 +36,7 @@ module Admin
redirect_to admin_conference_registration_period_path(@conference.short_title), redirect_to admin_conference_registration_period_path(@conference.short_title),
notice: 'Registration Period successfully updated.' notice: 'Registration Period successfully updated.'
else else
flash[:alert] = "A error prohibited the Registration Period from being saved: " \ flash[:alert] = 'A error prohibited the Registration Period from being saved: ' \
"#{@registration_period.errors.full_messages.join('. ')}." "#{@registration_period.errors.full_messages.join('. ')}."
render :edit render :edit
end end

View file

@ -162,4 +162,3 @@ describe Admin::RegistrationPeriodsController do
end end
end end

View file

@ -17,7 +17,7 @@ feature RegistrationPeriod do
click_button 'Save Registration Period' click_button 'Save Registration Period'
expect(flash). expect(flash).
to eq("A error prohibited the Registration Period from being saved: " \ to eq('A error prohibited the Registration Period from being saved: ' \
"Start date can't be blank. End date can't be blank.") "Start date can't be blank. End date can't be blank.")
page. page.

View file

@ -1,7 +1,7 @@
require 'spec_helper' require 'spec_helper'
describe 'conference/show.html.haml' do describe 'conference/show.html.haml' do
before(:each) do before(:each) do
allow(view).to receive(:date_string).and_return("January 17 - 21 2014") allow(view).to receive(:date_string).and_return('January 17 - 21 2014')
@conference = create(:conference, @conference = create(:conference,
sponsor_email: 'example@example.com') sponsor_email: 'example@example.com')