fix conflicts

This commit is contained in:
Stella Rouzi 2014-08-12 15:48:29 +03:00
parent e2fb434dc7
commit 71dfb3b7e4
34 changed files with 160 additions and 211 deletions

View file

@ -1,14 +1,15 @@
require 'spec_helper'
feature Track do
# It is necessary to use bang version of let to build roles before user
let!(:participant_role) { create(:participant_role) }
let!(:organizer_conference_1_role) { create(:organizer_conference_1_role) }
let!(:conference) { create(:conference) }
let!(:organizer_role) { create(:organizer_role, resource: conference) }
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
shared_examples 'tracks' do |user|
shared_examples 'tracks' do
scenario 'adds and updates tracks', feature: true, js: true do
conference = create(:conference)
sign_in create(user)
sign_in organizer
visit admin_conference_tracks_path(
conference_id: conference.short_title)
@ -50,6 +51,6 @@ feature Track do
end
describe 'organizer' do
it_behaves_like 'tracks', :organizer_conference_1
it_behaves_like 'tracks'
end
end