t#29194

diff --git a/spec/factories.rb b/spec/factories.rb
index 18cb73b..b8c0dfd 100644 (file)
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -52,34 +52,6 @@ FactoryGirl.define do
     license.system_picture_id 1
   end
 
-  factory :common_license, :class => CommonLicense do |license|
-    license.license_id 0
-    license.name 'peta2.1'
-    license.url 'http://test.lc/'
-    license.cc_by 0
-    license.cc_sa 0
-    license.cc_nd 0
-    license.cc_nc 0
-    license.no_resize 0
-    license.no_flip 0
-    license.no_convert 0
-    license.keep_aspect_ratio 0
-  end
-
-  factory :original_license, :class => OriginalLicense do |license|
-    license.license_id 0
-    license.name 'peta2.1'
-    license.url 'http://test.olc/'
-    license.cc_by 0
-    license.cc_sa 0
-    license.cc_nd 0
-    license.cc_nc 0
-    license.no_resize 0
-    license.no_flip 0
-    license.no_convert 0
-    license.keep_aspect_ratio 0
-  end
-
   factory :comic, :class => Comic do |comic|
     comic.title "comic"
     comic.width 100

diff --git a/spec/models/story_spec.rb b/spec/models/story_spec.rb
index 79d4850..1ba54ce 100644 (file)
--- a/spec/models/story_spec.rb
+++ b/spec/models/story_spec.rb
@@ -400,7 +400,7 @@ describe Story do
       s.should eq [@story]
     end
     it '時系列で並んでいる' do
-      ns = FactoryGirl.create :story, :author_id => @author.id, :comic_id => @comic.id, :panel_id => @panel.id, :t => 1
+      ns = FactoryGirl.create :story, :author_id => @author.id, :comic_id => @comic.id, :panel_id => @panel.id, :t => 1, :updated_at => Time.now + 100
       sl = Story.mylist @author
       sl.should eq [ns, @story]
     end