Tidied some specs

diff --git a/spec/models/feed_item_spec.rb b/spec/models/feed_item_spec.rb
index f932e431132af1c11af0202f123370822013d542..d2aabc6f7546abb4cd7a46a0e4977ca5ef5567d0 100644 (file)
--- a/spec/models/feed_item_spec.rb
+++ b/spec/models/feed_item_spec.rb
@@ -1,55 +1,49 @@
 require 'spec_helper'
 
 describe FeedItem do
-  before(:each) do
-    @feed_item = FeedItem.new(
-      :feed_name => "feed",
-      :title => "foo",
-      :description => "bar"
-    )
-  end
-
+ 
   it "is valid with valid attributes" do
-    expect(@feed_item).to be_valid
+    feed_item = FactoryGirl.build(:feed_item)
+    expect(feed_item).to be_valid
   end
 
   it "is not valid without a feed name" do
-    @feed_item.feed_name = nil
-    expect(@feed_item).not_to be_valid
+    feed_item = FactoryGirl.build(:feed_item, feed_name: nil)
+    expect(feed_item).not_to be_valid
   end
 
   it "is not valid without a title" do
-    @feed_item.title = nil
-    expect(@feed_item).not_to be_valid
+    feed_item = FactoryGirl.build(:feed_item, title: nil)
+    expect(feed_item).not_to be_valid
   end
 
   it "is not valid without a description" do
-    @feed_item.description = nil
-    expect(@feed_item).not_to be_valid
+    feed_item = FactoryGirl.build(:feed_item, description: nil)
+    expect(feed_item).not_to be_valid
   end
 
   it "is not valid with an improper feed name" do
-    @feed_item.feed_name = 'feed name'
-    expect(@feed_item).not_to be_valid
-    @feed_item.feed_name = 'feed%20name'
-    expect(@feed_item).not_to be_valid
-    @feed_item.feed_name = 'feed&name'
-    expect(@feed_item).not_to be_valid
-    @feed_item.feed_name = 'feed%26name'
-    expect(@feed_item).not_to be_valid
-    @feed_item.feed_name = 'feed<name'
-    expect(@feed_item).not_to be_valid
-    @feed_item.feed_name = 'feed%3Cname'
-    expect(@feed_item).not_to be_valid
-    @feed_item.feed_name = 'feed%name'
-    expect(@feed_item).not_to be_valid
-    @feed_item.feed_name = 'index'
-    expect(@feed_item).not_to be_valid
-    @feed_item.feed_name = 'show'
-    expect(@feed_item).not_to be_valid
-    @feed_item.feed_name = 'update'
-    expect(@feed_item).not_to be_valid
-    @feed_item.feed_name = 'action'
-    expect(@feed_item).not_to be_valid
+    feed_item = FactoryGirl.build(:feed_item, feed_name: 'feed name')
+    expect(feed_item).not_to be_valid
+    feed_item = FactoryGirl.build(:feed_item, feed_name: 'feed%20name')
+    expect(feed_item).not_to be_valid
+    feed_item = FactoryGirl.build(:feed_item, feed_name: 'feed&name')
+    expect(feed_item).not_to be_valid
+    feed_item = FactoryGirl.build(:feed_item, feed_name: 'feed%26name')
+    expect(feed_item).not_to be_valid
+    feed_item = FactoryGirl.build(:feed_item, feed_name: 'feed<name')
+    expect(feed_item).not_to be_valid
+    feed_item = FactoryGirl.build(:feed_item, feed_name: 'feed%3Cname')
+    expect(feed_item).not_to be_valid
+    feed_item = FactoryGirl.build(:feed_item, feed_name: 'feed%name')
+    expect(feed_item).not_to be_valid
+    feed_item = FactoryGirl.build(:feed_item, feed_name: 'index')
+    expect(feed_item).not_to be_valid
+    feed_item = FactoryGirl.build(:feed_item, feed_name: 'show')
+    expect(feed_item).not_to be_valid
+    feed_item = FactoryGirl.build(:feed_item, feed_name: 'update')
+    expect(feed_item).not_to be_valid
+    feed_item = FactoryGirl.build(:feed_item, feed_name: 'action')
+    expect(feed_item).not_to be_valid
   end
 end

diff --git a/spec/requests/format_spec.rb b/spec/requests/format_spec.rb
index b55c6f57644ebd0a58c8f7d4d6147b4c3f653fca..216cc3923d47918b77db0583a3c708ce0da3c296 100644 (file)
--- a/spec/requests/format_spec.rb
+++ b/spec/requests/format_spec.rb
@@ -1,12 +1,6 @@
 require 'spec_helper'
 
 describe "format" do
-  let!(:feed_item1) { FactoryGirl.create(:feed_item, 
-      title: "item 1") }
-  let!(:feed_item2) { FactoryGirl.create(:feed_item, 
-      title: "item 2") }
-  let!(:other_feed_item) { FactoryGirl.create(:feed_item, 
-      feed_name: "other_test_feed") }
 
   it "serves index as html by default" do
     get_via_redirect '/index'