Merge pull request #660 from bgeuken/conference_model

Conference model

spec/models/conference_spec.rb

@@ -1463,8 +1463,22 @@ describe Conference do
       end
     end
 
+    context 'user is nil' do
+      it '#user_registered? is false' do
+        expect(subject.user_registered? user).to be false
+      end
+    end
+
     context 'user registered' do
-      pending "isn't tested yet"
+      before do
+        registration = create(:registration)
+        subject.registrations << registration
+        user.registrations << registration
+      end
+
+      it '#user_registered? is true' do
+        expect(subject.user_registered? user).to be true
+      end
     end
   end