From e76d2b9ad642d0b3a565e10214c96364c667d4da Mon Sep 17 00:00:00 2001 From: kikito Date: Mon, 28 Sep 2015 17:19:53 +0200 Subject: [PATCH] fixes travis --- app/models/abilities/administrator.rb | 2 +- spec/features/admin/moderators_spec.rb | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb index bf17827f4..ab3db9c2b 100644 --- a/app/models/abilities/administrator.rb +++ b/app/models/abilities/administrator.rb @@ -31,7 +31,7 @@ module Abilities can :comment_as_administrator, [Debate, Comment, Proposal] - can [:search, :create, :index, :destroy], Moderator + can [:search, :create, :index, :destroy], ::Moderator end end end diff --git a/spec/features/admin/moderators_spec.rb b/spec/features/admin/moderators_spec.rb index d190e75a0..e8e29b182 100644 --- a/spec/features/admin/moderators_spec.rb +++ b/spec/features/admin/moderators_spec.rb @@ -2,21 +2,20 @@ require 'rails_helper' feature 'Admin moderators' do background do - @user = create(:user, username: 'Jose Luis Balbin') - @moderator = create(:moderator) @admin = create(:administrator) + @user = create(:user, username: 'Jose Luis Balbin') + @moderator = create(:moderator) login_as(@admin.user) + visit admin_moderators_path end scenario 'Index' do - visit admin_moderators_path expect(page).to have_content @moderator.name expect(page).to have_content @moderator.email expect(page).to_not have_content @user.name end scenario 'Create Moderator', :js do - visit admin_moderators_path fill_in 'email', with: @user.email click_button 'Search' @@ -28,7 +27,6 @@ feature 'Admin moderators' do end scenario 'Delete Moderator' do - visit admin_moderators_path click_link 'Delete' within("#moderators") do