From 9e0c871494eeb0a96b3994b30833b4bc84e955c0 Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Wed, 15 Apr 2015 10:23:24 +0200
Subject: [PATCH] Fix rubocop warnings and User index bug

---
 app/views/layouts/_user_menu.html.haml | 2 +-
 spec/features/proposal_spec.rb         | 4 ++--
 spec/models/conference_spec.rb         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_user_menu.html.haml b/app/views/layouts/_user_menu.html.haml
index f270d6b4..fe349b3b 100644
--- a/app/views/layouts/_user_menu.html.haml
+++ b/app/views/layouts/_user_menu.html.haml
@@ -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
diff --git a/spec/features/proposal_spec.rb b/spec/features/proposal_spec.rb
index 7de913a0..38b8c415 100644
--- a/spec/features/proposal_spec.rb
+++ b/spec/features/proposal_spec.rb
@@ -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
diff --git a/spec/models/conference_spec.rb b/spec/models/conference_spec.rb
index 09aafdbf..b1f6f419 100755
--- a/spec/models/conference_spec.rb
+++ b/spec/models/conference_spec.rb
@@ -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 = {}