mirror of
https://github.com/openSUSE/osem.git
synced 2026-08-13 19:54:02 +00:00
Fix rubocop warnings and User index bug
This commit is contained in:
parent
6a5cccbaad
commit
9e0c871494
3 changed files with 4 additions and 4 deletions
|
|
@ -37,7 +37,7 @@
|
|||
%span.fa.fa-cog
|
||||
Manage
|
||||
= @conference.short_title
|
||||
- if can? :index, User
|
||||
- if can? :manage, User.new
|
||||
%li
|
||||
= link_to(admin_users_path) do
|
||||
%span.fa.fa-user
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
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) { create(:user, email: 'admin@example.com', role_ids: [organizer_role.id]) }
|
||||
let!(:participant) { create(:user) }
|
||||
|
|
@ -97,7 +97,7 @@ feature Event do
|
|||
expect(page.has_content?('Unconfirmed')).to be true
|
||||
click_link "confirm_proposal_#{@event.id}"
|
||||
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
|
||||
expect(@event.state).to eq('confirmed')
|
||||
end
|
||||
|
|
|
|||
|
|
@ -516,7 +516,7 @@ describe Conference do
|
|||
|
||||
describe '#event_type_distribution' 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: @lecture)
|
||||
result = {}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue