fix specs

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index dc1065c..11a454e 100644 (file)
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -11,24 +11,29 @@ describe User do
     @basic = @klass.new(@valid_attributes)
   end
 
-  describe "email is blank" do
-    subject{ @basic.email = ""; @basic }
-    it{ should be_valid }
+  describe "basic" do
+    it{ @basic.should be_valid }
   end
 
-  describe "email is nil" do
-    subject{ @basic.email = nil; @basic }
-    it{ should be_valid }
-  end
-
-  describe "email is bad format" do
-    subject{ @basic.email = 'a..b@example.com'; @basic }
-    it{ should_not be_valid }
-  end
-
-  describe "email is not unique" do
-    subject{ Factory(:user); @basic }
-    it{ should_not be_valid }
+  describe "validations" do
+    describe "email" do
+      describe "is blank" do
+        subject{ @basic.email = ""; @basic }
+        it{ should be_valid }
+      end
+      describe "is nil" do
+        subject{ @basic.email = nil; @basic }
+        it{ should be_valid }
+      end
+      describe "is bad format" do
+        subject{ @basic.email = 'a..b@example.com'; @basic }
+        it{ should_not be_valid }
+      end
+      describe "is not unique" do
+        subject{ Factory(:user); @basic }
+        it{ should_not be_valid }
+      end
+    end
   end
 
   describe "associations" do
@@ -36,6 +41,12 @@ describe User do
       subject{ Factory(:user_with_reports) }
       its(:reports){ should have(2).reports }
     end
+    describe "belongs_to :affiliation" do
+      before do
+        @target = Factory(:user, :affiliation => Factory(:affiliation))
+      end
+      it{ @target.affiliation.name.should == "University" }
+    end
   end
 
   describe "callback" do