gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rubocop files update and auto correction

Browse source
This commit is contained in:
raluka 2015-10-21 17:33:53 +02:00
parent 42e8bb11ea
commit 2a30b076b8
88 changed files with 519 additions and 452 deletions
Download patch file Download diff file Expand all files Collapse all files

1
spec/controllers/admin/comments_controller_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe Admin::CommentsController, type: :controller do
# It is necessary to use bang version of let to build roles before user
let(:conference) { create(:conference) }
let!(:first_user) { create(:user) }

24
spec/controllers/admin/conferences_controller_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe Admin::ConferenceController do
# It is necessary to use bang version of let to build roles before user
let(:conference) { create(:conference, end_date: Date.new(2014, 05, 26) + 15) }
let!(:first_user) { create(:user) }
@ -12,11 +11,8 @@ describe Admin::ConferenceController do
let(:participant) { create(:user) }
shared_examples 'access as organizer' do
describe 'PATCH #update' do
context 'valid attributes' do
it 'locates the requested conference' do
patch :update, id: conference.short_title, conference: attributes_for(:conference, title: 'Example Con')
expect(assigns(:conference)).to eq(conference)
@ -37,7 +33,7 @@ describe Admin::ConferenceController do
attributes_for(:conference, title: 'Example Con')
conference.reload
expect(response).to redirect_to edit_admin_conference_path(
conference.short_title)
conference.short_title)
end
it 'sends email notification on conference date update' do
@ -58,7 +54,7 @@ describe Admin::ConferenceController do
conference.reload
expect(flash[:alert]).
to eq("Updating conference failed. Short title can't be blank.")
to eq("Updating conference failed. Short title can't be blank.")
expect(conference.title).to eq('The dog and pony show')
expect(conference.short_title).to eq("#{conference.short_title}")
end
@ -69,9 +65,9 @@ describe Admin::ConferenceController do
short_title: nil)
expect(flash[:alert]).
to eq("Updating conference failed. Short title can't be blank.")
to eq("Updating conference failed. Short title can't be blank.")
expect(response).to redirect_to edit_admin_conference_path(
conference.short_title)
conference.short_title)
end
end
end
@ -91,7 +87,7 @@ describe Admin::ConferenceController do
attributes_for(:conference, short_title: 'dps15')
expect(response).to redirect_to admin_conference_path(
assigns[:conference].short_title)
assigns[:conference].short_title)
end
end
@ -181,9 +177,7 @@ describe Admin::ConferenceController do
context 'no conferences' do
it 'redirect to new conference' do
Conference.all.each do |c|
c.destroy
end
Conference.all.each(&:destroy)
sign_in create(:admin)
get :index
expect(response).to redirect_to new_admin_conference_path
@ -289,7 +283,6 @@ describe Admin::ConferenceController do
describe 'DELETE #remove_user' do
before(:each) do
end
it 'sets selection variable' do
@ -329,13 +322,11 @@ describe Admin::ConferenceController do
end
describe 'organizer access' do
before do
sign_in(organizer)
end
it_behaves_like 'access as organizer'
end
shared_examples 'access as participant or guest' do |path, message|
@ -399,12 +390,9 @@ describe Admin::ConferenceController do
end
it_behaves_like 'access as participant or guest', :root_path, 'You are not authorized to access this area!'
end
describe 'guest access' do
it_behaves_like 'access as participant or guest', :new_user_session_path
end
end

10
spec/controllers/admin/registration_periods_controller_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe Admin::RegistrationPeriodsController do
# It is necessary to use bang version of let to build roles before user
let(:conference) { create(:conference) }
let!(:first_user) { create(:user) }
@ -12,15 +11,12 @@ describe Admin::RegistrationPeriodsController do
let(:participant) { create(:user) }
shared_examples 'access as administration or organizer' do
before do
conference.registration_period = create(:registration_period)
end
describe 'PATCH #update' do
context 'valid attributes' do
it 'locates the requested registration period object' do
patch :update, conference_id: conference.short_title, conference: attributes_for(:registration_period)
expect(assigns(:registration_period)).to eq(conference.registration_period)
@ -40,7 +36,7 @@ describe Admin::RegistrationPeriodsController do
attributes_for(:registration_period)
conference.reload
expect(response).to redirect_to admin_conference_registration_period_path(
conference.short_title)
conference.short_title)
end
it 'sends email notification on conference registration date update' do
@ -78,7 +74,7 @@ describe Admin::RegistrationPeriodsController do
registration_period: attributes_for(:registration_period)
expect(response).to redirect_to admin_conference_registration_period_path(
assigns[:conference].short_title)
assigns[:conference].short_title)
end
end
@ -153,12 +149,10 @@ describe Admin::RegistrationPeriodsController do
end
describe 'organizer access' do
before(:each) do
sign_in(organizer)
end
it_behaves_like 'access as administration or organizer'
end
end

2
spec/controllers/admin/users_controller_spec.rb
View file

@ -28,7 +28,7 @@ describe Admin::UsersController do
patch :update, id: user.id
expect(build(
:user, email: 'new@email.osem', id: user.id).email).
to eq('new@email.osem')
to eq('new@email.osem')
end
it 'redirects to the updated user' do
patch :update, id: user.id

3
spec/controllers/conference_controller_spec.rb
View file

@ -1,7 +1,7 @@
require 'spec_helper'
describe ConferenceController do
let(:conference) { create(:conference, splashpage: create(:splashpage, public: true)) }
let(:conference) { create(:conference, splashpage: create(:splashpage, public: true)) }
describe 'GET #index' do
it 'Response code is 200' do
@ -30,5 +30,4 @@ describe ConferenceController do
expect(response.response_code).to eq(200)
end
end
end