Re wrote a few expects in model specs

spec/models/activity_spec.rb

@@ -2,12 +2,7 @@
 
 describe Activity do
   describe "associations" do
-    it "should belong to user" do
-      should belong_to(:user)
-    end
-
-    it "should belong to channel" do
-      should belong_to(:channel)
-    end
+    it { should belong_to(:user) }
+    it { should belong_to(:channel) }
   end
 end

spec/models/attachment_spec.rb

@@ -2,12 +2,15 @@
 
 describe Attachment do
   describe "associations" do
-    it "should belong to channel" do
-      should belong_to(:channel)
-    end
-
-    it "should belong to user" do
-      should belong_to(:user)
+    it { should belong_to(:channel) }
+    it { should belong_to(:user) }
+  end
+
+  describe "#url" do
+    subject { double('attachment', url: 'some_string', file: 'file') }
+
+    it "should return a string file_name" do
+      expect(subject.url).to eq('some_string')
     end
   end
 end

spec/models/channel_spec.rb

@@ -2,13 +2,8 @@
 
 describe Channel do
   describe "associations" do
-    it "should have many activities" do
-      should have_many(:activities)
-    end
-
-    it "should have many attachments" do
-      should have_many(:attachments)
-    end
+    it { should have_many(:activities) }
+    it { should have_many(:attachments) }
   end
 
   describe "user_connect" do

spec/models/user_spec.rb

@@ -2,18 +2,16 @@
 
 describe User do
   describe "associations" do
-    it "should have many activities" do
-      should have_many(:activities)
-    end
+    it { should have_many(:activities) }
   end
 
   it "should have authentication token on creation" do
-    @user = FactoryGirl.create(:user)
-    @user.authentication_token.should_not be_nil
+    subject { @user.authentication_token }
+    expect(subject).to_not eq(nil)
   end
 
   it "should have gravatar hash on creation" do
-    @user = FactoryGirl.create(:user)
-    @user.gravatar_hash.should_not be_nil
+    subject { @user.gravatar_hash }
+    expect(subject).to_not eq(nil)
   end
 end