Fix rubocop warnings and User index bug

This commit is contained in:
Henne Vogelsang 2015-04-15 10:23:24 +02:00
parent 6a5cccbaad
commit 9e0c871494
3 changed files with 4 additions and 4 deletions

View file

@ -37,7 +37,7 @@
%span.fa.fa-cog %span.fa.fa-cog
Manage Manage
= @conference.short_title = @conference.short_title
- if can? :index, User - if can? :manage, User.new
%li %li
= link_to(admin_users_path) do = link_to(admin_users_path) do
%span.fa.fa-user %span.fa.fa-user

View file

@ -1,7 +1,7 @@
require 'spec_helper' require 'spec_helper'
feature Event do feature Event do
let!(:conference) { create(:conference, call_for_paper: create(:call_for_paper) ) } let!(:conference) { create(:conference, call_for_paper: create(:call_for_paper)) }
let!(:organizer_role) { create(:organizer_role, resource: conference) } let!(:organizer_role) { create(:organizer_role, resource: conference) }
let!(:organizer) { create(:user, email: 'admin@example.com', role_ids: [organizer_role.id]) } let!(:organizer) { create(:user, email: 'admin@example.com', role_ids: [organizer_role.id]) }
let!(:participant) { create(:user) } let!(:participant) { create(:user) }
@ -97,7 +97,7 @@ feature Event do
expect(page.has_content?('Unconfirmed')).to be true expect(page.has_content?('Unconfirmed')).to be true
click_link "confirm_proposal_#{@event.id}" click_link "confirm_proposal_#{@event.id}"
expect(flash). expect(flash).
to eq('The proposal was confirmed. Please register to attend the conference.') to eq('The proposal was confirmed. Please register to attend the conference.')
@event.reload @event.reload
expect(@event.state).to eq('confirmed') expect(@event.state).to eq('confirmed')
end end

View file

@ -516,7 +516,7 @@ describe Conference do
describe '#event_type_distribution' do describe '#event_type_distribution' do
it 'calculates correct for different event types' do it 'calculates correct for different event types' do
blah = create(:event, conference: subject, event_type: @workshop) create(:event, conference: subject, event_type: @workshop)
create(:event, conference: subject, event_type: @workshop) create(:event, conference: subject, event_type: @workshop)
create(:event, conference: subject, event_type: @lecture) create(:event, conference: subject, event_type: @lecture)
result = {} result = {}