Merge branch 'master' of https://github.com/openSUSE/osem into feature_tests2

app/models/user.rb

@@ -29,15 +29,8 @@ class User < ActiveRecord::Base
   end
 
   def setup_role
-    if User.count == 0
-      admin = Role.where(name: 'Admin').first
-      self.role_ids = [admin.id] unless admin.nil?
-    end
-
-    if self.role_ids.empty?
-      participant = Role.where(name: 'Participant').first
-      self.role_ids = [participant.id] unless participant.nil?
-    end
+    roles << Role.find_by(name: 'Admin') if User.count == 0
+    roles << Role.find_by(name: 'Participant') if roles.empty?
   end
 
   def popup_details
@@ -56,9 +49,9 @@ class User < ActiveRecord::Base
   end
 
   private
-    def create_person
-      # TODO Search people for existing email address, add to their account
-      build_person(:email => self.email) if person.nil?
-      true
-    end
+  def create_person
+    # TODO Search people for existing email address, add to their account
+    build_person(email: email) if person.nil?
+    true
+  end
 end

spec/controllers/conferences_controller_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 
 describe Admin::ConferenceController do
 
+  # It is necessary to use bang version of let to build roles before user
+  let!(:organizer_role) { create(:organizer_role) }
+  let!(:participant_role) { create(:participant_role) }
+  let!(:admin_role) { create(:admin_role) }
+
   let(:conference) { create(:conference) }
   let(:admin) { create(:admin) }
   let(:organizer) { create(:organizer) }

spec/features/conference_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 
 feature Conference do
 
+  # It is necessary to use bang version of let to build roles before user
+  let!(:organizer_role) { create(:organizer_role) }
+  let!(:participant_role) { create(:participant_role) }
+  let!(:admin_role) { create(:admin_role) }
+
   shared_examples 'add and update conference' do |user|
     scenario 'adds a new conference', feature: true, js: true do
       expected_count = Conference.count + 1

spec/features/proposal_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 feature Event do
+  # It is necessary to use bang version of let to build roles before user
+  let!(:organizer_role) { create(:organizer_role) }
+  let!(:participant_role) { create(:participant_role) }
+  let!(:admin_role) { create(:admin_role) }
 
   shared_examples 'proposal workflow' do
     scenario 'submitts a new proposal, accepts and confirms', feature: true, js: true do

spec/models/conference_spec.rb

@@ -52,6 +52,11 @@ describe Conference do
 
   describe '#user_registered?' do
 
+    # It is necessary to use bang version of let to build roles before user
+    let!(:organizer_role) { create(:organizer_role) }
+    let!(:participant_role) { create(:participant_role) }
+    let!(:admin_role) { create(:admin_role) }
+
     let(:user) { create(:user) }
 
     context 'user not registered' do