fix conflicts

spec/features/campaign_spec.rb

@@ -2,15 +2,14 @@ require 'spec_helper'
 
 feature Campaign 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, short_title: 'osc14') }
+  let!(:organizer_role) { create(:organizer_role, resource: conference) }
+  let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
 
-  shared_examples 'add and update campaign' do |user|
+  shared_examples 'add and update campaign' do
     scenario 'adds and update a campaign', feature: true, js: true do
       expected_count = Campaign.count + 1
-      conference = create(:conference, short_title: 'osc14')
-      sign_in create(user)
+      sign_in organizer
 
       visit admin_conference_campaigns_path(conference.short_title)
 
@@ -52,6 +51,6 @@ feature Campaign do
   end
 
   describe 'organizer' do
-    it_behaves_like 'add and update campaign', :organizer_conference_1
+    it_behaves_like 'add and update campaign'
   end
 end

spec/features/cfp_spec.rb

@@ -2,15 +2,15 @@ require 'spec_helper'
 
 feature Conference 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 'add and update cfp' do |user|
+  shared_examples 'add and update cfp' do
     scenario 'adds a new cfp', feature: true, js: true do
       expected_count = CallForPapers.count + 1
-      conference = create(:conference)
-      sign_in create(user)
+
+      sign_in organizer
 
       visit admin_conference_callforpapers_path(conference.short_title)
 
@@ -46,11 +46,10 @@ feature Conference do
     end
 
     scenario 'update cfp', feature: true, js: true do
-      conference = create(:conference)
       conference.call_for_papers = create(:call_for_papers)
       expected_count = CallForPapers.count
 
-      sign_in create(user)
+      sign_in organizer
       visit admin_conference_callforpapers_path(conference.short_title)
 
       # Validate update with empty start date will not saved
@@ -87,6 +86,6 @@ feature Conference do
   end
 
   describe 'organizer' do
-    it_behaves_like 'add and update cfp', :organizer_conference_1
+    it_behaves_like 'add and update cfp'
   end
 end

spec/features/commercials_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 feature Commercial do
   # It is necessary to use bang version of let to build roles before user
   let!(:conference) { create(:conference) }
-  let!(:organizer_role) { create(:role, name: 'organizer', resource: conference) }
+  let!(:organizer_role) { create(:organizer_role, resource: conference) }
   let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
 
   shared_examples 'adds and updates a commercial' do

spec/features/conference_spec.rb

@@ -1,15 +1,12 @@
 require 'spec_helper'
 
 feature Conference do
+  let!(:user) { create(:admin) }
 
-  # 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) }
-
-  shared_examples 'add and update conference' do |user|
+  shared_examples 'add and update conference' do
     scenario 'adds a new conference', feature: true, js: true do
       expected_count = Conference.count + 1
-      sign_in create(user)
+      sign_in user
 
       visit new_admin_conference_path
       fill_in 'conference_title', with: 'Example Con'
@@ -30,12 +27,18 @@ feature Conference do
       expect(flash).
           to eq('Conference was successfully created.')
       expect(Conference.count).to eq(expected_count)
+
+      expect(user.has_role? :organizer, Conference.last).to eq(true)
     end
 
     scenario 'update conference', feature: true, js: true do
       conference = create(:conference)
+      organizer_role = create(:organizer_role, resource: conference)
+      organizer = create(:user, role_ids: [organizer_role.id])
+
       expected_count = Conference.count
-      sign_in create(:organizer_conference_1)
+
+      sign_in organizer
 
       visit edit_admin_conference_path(conference.short_title)
       click_link 'Edit'
@@ -62,6 +65,6 @@ feature Conference do
   end
 
   describe 'admin' do
-    it_behaves_like 'add and update conference', :admin
+    it_behaves_like 'add and update conference'
   end
 end

spec/features/difficulty_levels_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 feature DifficultyLevel 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 'difficulty levels' do |user|
+  shared_examples 'difficulty levels' do
     scenario 'adds and updates difficulty level', feature: true, js: true do
-      conference = create(:conference)
-      sign_in create(user)
+
+      sign_in organizer
       visit admin_conference_difficulty_levels_path(
                 conference_id: conference.short_title)
 
@@ -50,6 +50,6 @@ feature DifficultyLevel do
   end
 
   describe 'organizer' do
-    it_behaves_like 'difficulty levels', :organizer_conference_1
+    it_behaves_like 'difficulty levels'
   end
 end

spec/features/email_spec.rb

@@ -1,18 +1,17 @@
 require 'spec_helper'
 
 feature EmailSettings 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 'email settings' do |user|
+  shared_examples 'email settings' do
     scenario 'updates email settings',
              feature: true, js: true do
 
-      conference = create(:conference)
       expected_count = EmailSettings.count
 
-      sign_in create(user)
+      sign_in organizer
 
       visit admin_conference_emails_path(conference.short_title)
 
@@ -91,6 +90,6 @@ feature EmailSettings do
   end
 
   describe 'organizer' do
-    it_behaves_like 'email settings', :organizer_conference_1
+    it_behaves_like 'email settings'
   end
 end

spec/features/event_types_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 feature EventType 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 'event types' do |user|
+  shared_examples 'event types' do
     scenario 'adds and updates event type', feature: true, js: true do
-      conference = create(:conference)
-      sign_in create(user)
+
+      sign_in organizer
       visit admin_conference_event_types_path(
                 conference_id: conference.short_title)
 
@@ -55,6 +55,6 @@ feature EventType do
   end
 
   describe 'organizer' do
-    it_behaves_like 'event types', :organizer_conference_1
+    it_behaves_like 'event types'
   end
 end

spec/features/lodgings_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
 feature Lodging 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 'lodgings' do |user|
+  shared_examples 'lodgings' do
     scenario 'adds and updates lodgings', feature: true, js: true do
       path = "#{Rails.root}/app/assets/images/rails.png"
-      conference = create(:conference)
+
       conference.venue = create(:venue)
-      sign_in create(user)
+      sign_in organizer
       visit admin_conference_lodgings_path(
                 conference_id: conference.short_title)
       # Add lodging
@@ -56,6 +56,6 @@ feature Lodging do
   end
 
   describe 'organizer' do
-    it_behaves_like 'lodgings', :organizer_conference_1
+    it_behaves_like 'lodgings'
   end
 end

spec/features/omniauth_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature Openid do
-  let!(:participant_role) { create(:participant_role) }
-
   shared_examples 'sign in with openid' do
 
     scenario 'has option to log in with Google account' do
@@ -26,7 +24,7 @@ feature Openid do
     end
 
     scenario 'signs in an existing user' do
-      create(:participant, email: 'test-participant-1@google.com')
+      create(:user, email: 'test-participant-1@google.com')
       expected_count_openid = Openid.count + 1
       expected_count_user = User.count
       visit '/accounts/sign_in'
@@ -53,7 +51,7 @@ feature Openid do
 
     scenario 'adds openid to existing user' do
       # Sign in user
-      user = create(:participant, email: 'test-participant-1@google.com')
+      user = create(:user, email: 'test-participant-1@google.com')
       sign_in user
 
       # Add openID to current user
@@ -73,7 +71,7 @@ feature Openid do
 
     scenario 'signs in with openID using the same email as another associated openid' do
       # Sign in user
-      create(:participant, email: 'test-participant-1@google.com')
+      create(:user, email: 'test-participant-1@google.com')
       expected_count_openid = Openid.count + 1
       expected_count_user = User.count
       visit '/accounts/sign_in'

spec/features/proposal_spec.rb

@@ -1,19 +1,17 @@
 require 'spec_helper'
 
 feature Event 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, email: 'admin@example.com', role_ids: [organizer_role.id]) }
+  let!(:participant) { create(:user, biography: '') }
 
   shared_examples 'proposal workflow' do
     scenario 'submitts a proposal, accepts and confirms',
              feature: true, js: true do
 
-      organizer = create(:organizer_conference_1, email: 'admin@example.com')
-      participant = create(:user, email: 'participant@example.com', biography: '')
-
       expected_count = Event.count + 1
-      conference = create(:conference)
+
       conference.call_for_papers = create(:call_for_papers)
       conference.email_settings = create(:email_settings)
       conference.event_types = [create(:event_type)]

spec/features/rooms_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 feature Room 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 'rooms' do |user|
+  shared_examples 'rooms' do
     scenario 'adds and updates rooms', feature: true, js: true do
-      conference = create(:conference)
-      sign_in create(user)
+
+      sign_in organizer
       visit admin_conference_rooms_path(
                 conference_id: conference.short_title)
 
@@ -43,6 +43,6 @@ feature Room do
   end
 
   describe 'organizer' do
-    it_behaves_like 'rooms', :organizer_conference_1
+    it_behaves_like 'rooms'
   end
 end

spec/features/sponsor_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
 feature Sponsor 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 'sponsors' do |user|
+  shared_examples 'sponsors' do
     scenario 'adds and updates sponsors', feature: true, js: true do
       path = "#{Rails.root}/app/assets/images/rails.png"
-      conference = create(:conference)
+
       conference.sponsorship_levels << create(:sponsorship_level, conference: conference)
-      sign_in create(user)
+      sign_in organizer
 
       visit admin_conference_sponsors_path(
                 conference_id: conference.short_title)
@@ -69,6 +69,6 @@ feature Sponsor do
   end
 
   describe 'organizer' do
-    it_behaves_like 'sponsors', :organizer_conference_1
+    it_behaves_like 'sponsors'
   end
 end

spec/features/sponsorship_level_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 feature SponsorshipLevel 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 'sponsorship levels' do |user|
+  shared_examples 'sponsorship levels' do
     scenario 'adds and updates sponsorship level', feature: true, js: true do
-      conference = create(:conference)
-      sign_in create(user)
+
+      sign_in organizer
       visit admin_conference_sponsorship_levels_path(
                 conference_id: conference.short_title)
       # Add sponsorship level
@@ -36,6 +36,6 @@ feature SponsorshipLevel do
   end
 
   describe 'organizer' do
-    it_behaves_like 'sponsorship levels', :organizer_conference_1
+    it_behaves_like 'sponsorship levels'
   end
 end

spec/features/tracks_spec.rb

@@ -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

spec/features/venue_spec.rb

@@ -1,16 +1,15 @@
 require 'spec_helper'
 
 feature Conference do
+  let!(:conference) { create(:conference) }
+  let!(:organizer_role) { create(:organizer_role, resource: conference) }
+  let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
 
-  # It is necessary to use bang version of let to build roles before user
-  let!(:participant_role) { create(:participant_role) }
-  let!(:organizer_role) { create(:organizer_conference_1_role) }
-
-  shared_examples 'venue' do |user|
+  shared_examples 'venue' do
     scenario 'adds and updates venue' do
-      conference = create(:conference)
 
-      sign_in create(user)
+      sign_in organizer
+
       visit admin_conference_venue_info_path(
                 conference_id: conference.short_title)
 
@@ -59,7 +58,7 @@ feature Conference do
   end
 
   describe 'organizer' do
-    it_behaves_like 'venue', :organizer_conference_1
+    it_behaves_like 'venue'
   end
 
 end

spec/features/volunteers_spec.rb

@@ -1,11 +1,9 @@
 require 'spec_helper'
 
 feature Conference 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(:organizer) { create(:organizer_conference_1) }
-  let(:conference) { create(:conference) }
+  let!(:conference) { create(:conference) }
+  let!(:organizer_role) { create(:organizer_role, resource: conference) }
+  let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
 
   shared_examples 'volunteer' do
     scenario 'adds and updates vdays', feature: true, js: true do