typo 4.0.3 → 4.1

data/spec/models/trigger_spec.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+context 'With the contents fixture' do
+  fixtures :contents
+
+  setup do
+    @page = mock('fake_page')
+    @page.stub!(:id).and_return(1)
+    @page.stub!(:type).and_return('Page')
+    @page.stub!(:new_record?).and_return(false)
+    @page.stub!(:class).and_return(Page)
+    Content.stub!(:find).and_return(@page)
+    @current_utime = 1
+    Time.stub!(:now).and_return { Time.at(@current_utime) }
+  end
+
+  def sleep(time_delta)
+    @current_utime += time_delta
+  end
+
+  specify '.post_action should not fire immediately for future triggers' do
+    lambda do
+      Trigger.post_action(Time.now + 2, @page, 'tickle')
+      Trigger.count.should == 1
+      Trigger.fire
+      Trigger.count.should == 1
+    end.should_not_raise
+
+    @page.should_receive(:tickle)
+    sleep 2
+    Trigger.fire
+    Trigger.count.should == 0
+  end
+
+  specify '.post_action should fire immediately if the target time is <= now' do
+    @page.should_receive(:tickle)
+    Trigger.post_action(Time.now, @page, 'tickle')
+    Trigger.count.should == 0
+  end
+
+end

data/spec/models/user_spec.rb

@@ -0,0 +1,105 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+context 'With the contents and users fixtures loaded' do
+  fixtures :users, :contents, :blogs
+
+  setup do
+    User.stub!(:salt).and_return('change-me')
+  end
+
+  specify 'Calling User.authenticate with a valid user/password combo returns a user' do
+    User.authenticate('bob', 'test').should == users(:bob)
+  end
+
+  specify 'User.authenticate(user,invalid) returns nil' do
+    User.authenticate('bob', 'wrong password').should_be nil
+  end
+
+  specify 'User.authenticate(invalid,whatever) returns nil' do
+    User.authenticate('userwhodoesnotexist', 'what ever').should_be nil
+  end
+
+  specify 'The various article finders work appropriately' do
+    User.find(1).articles.size.should == 8
+#    User.find(1).articles.find_published.size.should == Article.find(:all, :conditions => {:published => true}).size
+    User.find(1).articles.published.size == 7
+  end
+
+  specify 'authenticate? works as expected' do
+    User.should_authenticate('bob', 'test')
+    User.should_not_authenticate('bob', 'duff password')
+  end
+end
+
+context 'With a new user' do
+  setup do
+    @user = User.new :login => 'not_bob'
+    set_password 'a secure password'
+  end
+
+  specify 'password cannot be too short' do
+    set_password 'tiny'
+    @user.should_not_be_valid
+    @user.errors.should_be_invalid('password')
+  end
+
+  specify 'password cannot be too long' do
+    set_password 'x' * 80
+    @user.should_not_be_valid
+    @user.errors.should_be_invalid('password')
+  end
+
+  specify 'password cannot be blank' do
+    set_password ''
+    @user.should_not_be_valid
+    @user.errors.should_be_invalid('password')
+  end
+
+  specify 'password can be just right' do
+    set_password 'Just right'
+    @user.should_be_valid
+  end
+
+  specify 'login cannot be too short' do
+    @user.login = 'x'
+    @user.should_not_be_valid
+    @user.errors.should_be_invalid('login')
+  end
+
+  specify 'login cannot be too long' do
+    @user.login = 'repetitivebob' * 10
+    @user.should_not_be_valid
+    @user.errors.should_be_invalid('login')
+  end
+
+  specify 'login cannot be blank' do
+    @user.login = ''
+    @user.should_not_be_valid
+    @user.errors.should_be_invalid('login')
+  end
+
+  specify 'login can be just right' do
+    @user.login = 'okbob'
+    @user.should_be_valid
+  end
+
+  def set_password(newpass)
+    @user.password = @user.password_confirmation = newpass
+  end
+end
+
+context 'With a user, "bob" in the database' do
+  setup do
+    User.delete_all
+    u = User.new(:login => 'bob')
+    u.password = u.password_confirmation = 'secure password'
+    u.save!
+  end
+
+  specify 'should not be able to create another user with the same login' do
+    u = User.new(:login => 'bob') {|u| u.password = u.password_confirmation = 'secure password'}
+
+    u.should_not_be_valid
+    u.errors.should_be_invalid('login')
+  end
+end

data/test/fixtures/blogs.yml

@@ -1,12 +1,13 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 default:
   id: 1
+  base_url: http://myblog.net
   settings:
     jabber_password: ""
     show_extended_on_rss: true
     itunes_owner: ""
     blog_name: test blog
-    title_prefix: true
+    title_prefix: 1
     limit_article_display: 10
     sp_url_limit: 3
     use_gravatar: false
@@ -33,18 +34,18 @@ default:
     sp_article_auto_close: 300
     link_to_author: false
     itunes_summary: ""
-    comment_text_filter: textile
+    comment_text_filter: markdown
     sp_allow_non_ajax_comments: true
-    canonical_server_url: http://myblog.net/
 
 second:
   id: 2
+  base_url: http://otherblog.net
   settings:
     jabber_password: ""
     show_extended_on_rss: true
     itunes_owner: ""
     blog_name: second test blog
-    title_prefix: false
+    title_prefix: 0
     limit_article_display: 10
     sp_url_limit: 0
     use_gravatar: false

data/test/fixtures/categorizations.yml

@@ -0,0 +1,31 @@
+articles_categories1:
+  article_id: 1
+  category_id: 1
+
+articles_categories2:
+  article_id: 1
+  category_id: 2
+
+articles_categories3:
+  article_id: 1
+  category_id: 3
+
+articles_categories4:
+  article_id: 2 
+  category_id: 3
+
+articles_categories5:
+  article_id: 3
+  category_id: 3
+  
+articles_categories6:
+  article_id: 4
+  category_id: 3
+
+articles_categories7:
+  article_id: 1
+  category_id: 5
+
+articles_categories8:
+  article_id: 18
+  category_id: 6

data/test/fixtures/contents.yml

@@ -2,12 +2,10 @@
 
 article1:
   blog_id: 1
-  id: 1 
+  id: 1
   title: Article 1!
   body: body
-  body_html: body
   extended: extended content
-  extended_html: extended content
   created_at: <%= (Time.now - 2.days).strftime("%Y-%m-%d") %>
   updated_at: <%= (Time.now - 2.days).strftime("%Y-%m-%d") %>
   published_at: <%= (Time.now - 2.days).strftime("%Y-%m-%d") %>
@@ -20,16 +18,14 @@ article1:
   type: Article
   published: true
   state: ContentState::Published
-  
+
 article2:
   type: Article
   blog_id: 1
   id: 2
   title: Article 2!
   body: body
-  body_html: body
   extended: extended content
-  extended_html: extended content
   created_at: <%= (Time.now - 1.days).strftime("%Y-%m-%d") %>
   updated_at: <%= (Time.now - 1.days).strftime("%Y-%m-%d") %>
   published_at: <%= (Time.now - 1.days).strftime("%Y-%m-%d") %>
@@ -49,9 +45,7 @@ article3:
   id: 3
   title: Article 3!
   body: body
-  body_html: body
   extended: extended content
-  extended_html: extended content
   created_at: 2004-06-01 20:00:02
   updated_at: 2004-06-01 20:00:02
   published_at: 2004-06-01 20:00:02
@@ -70,7 +64,6 @@ article4:
   id: 4
   title: Article 4!
   body: I'm not "public":http://www.example.com/public!
-  body_html: I'm not <a href="http://www.example.com/public">public</a>!
   published: false
   state: ContentState::Draft
   created_at: 2004-06-01 20:00:01
@@ -83,102 +76,6 @@ article4:
   author: Tobi
   guid: ddddd
 
-spam_comment:
-  type: Comment
-  blog_id: 1
-  id: 5
-  published: true
-  article_id: 2
-  author: Bob Foo
-  url: http://fakeurl.com
-  body: Test <a href="http://fakeurl.co.uk">body</a>
-  created_at: 2005-01-01 02:00:00
-  updated_at: 2005-01-01 02:00:00
-  published_at: 2005-01-01 02:00:00
-  guid: 12313123123123123
-  state: ContentState::Ham
-
-comment2:
-  type: Comment
-  blog_id: 1
-  id: 6
-  published: true
-  article_id: 1
-  author: John Bar
-  user_id: 2
-  url: www.google.com
-  email: john.bar@google.com
-  body: Comment body _italic_ *bold*
-  created_at: 2005-01-01 02:00:01
-  updated_at: 2005-01-01 02:00:01
-  published_at: 2005-01-01 02:00:01
-  guid: 453456456456456
-  state: ContentState::Ham
-
-comment3:
-  type: Comment
-  blog_id: 1
-  id: 12
-  published: false
-  state: ContentState::PresumedSpam
-  status_confirmed: false
-  article_id: 1
-  author: Foo Bar
-  body: Zzzzzz
-  created_at: 2005-01-01 02:00:07
-  updated_at: 2005-01-01 02:00:07
-  published_at: 2005-01-01 02:00:07
-  guid: 4534564564564567
-
-trackback1:
-  type: Trackback
-  blog_id: 1
-  id: 7
-  article_id: 2
-  published: false
-  state: ContentState::PresumedSpam
-  status_confirmed: false
-  blog_name: Trackback Blog
-  title: Trackback Entry
-  url: http://www.example.com
-  excerpt: This is an excerpt
-  created_at: 2005-01-01 03:00:00
-  updated_at: 2005-01-01 03:00:00
-  published_at: 2005-01-01 03:00:00
-  guid: dsafsadffsdsf
-
-trackback2:
-  type: Trackback
-  blog_id: 1
-  id: 8
-  article_id: 1
-  state: ContentState::PresumedHam
-  published: true
-  blog_name: Trackback Blog
-  title: Trackback Entry
-  url: http://www.example.com
-  excerpt: This is an excerpt
-  created_at: 2005-01-01 03:00:01
-  updated_at: 2005-01-01 03:00:01
-  published_at: 2005-01-01 03:00:01
-  guid: qweqweqddsfcs
-
-trackback3:
-  type: Trackback
-  blog_id: 1
-  id: 13
-  article_id: 1
-  published: true
-  state: ContentState::PresumedHam
-  blog_name: Trackback Blog 2
-  title: Trackback Entry 2
-  url: http://www.example.com
-  excerpt: This is an excerpt
-  created_at: 2005-01-01 03:00:03
-  updated_at: 2005-01-01 03:00:03
-  published_at: 2005-01-01 03:00:03
-  guid: qweqweqddsfcs3
-
 first_page:
   type: Page
   blog_id: 1
@@ -228,9 +125,7 @@ inactive_article:
   id: 14
   title: Inactive Article
   body: body
-  body_html: body
   extended: extended content
-  extended_html: extended content
   created_at: 2004-05-01 20:00:02
   updated_at: 2004-05-01 20:00:02
   published_at: 2004-05-01 20:00:02
@@ -243,31 +138,13 @@ inactive_article:
   published: true
   state: ContentState::Published
 
-old_comment:
-  type: Comment
-  blog_id: 1
-  id: 15
-  article_id: 14
-  author: John Bar
-  guid: b1i2n3g4o5t6i7v
-  url: www.google.com
-  email: john.bar@google.com
-  body: Comment body _italic_ *bold*
-  created_at: 2004-05-02 20:00:02
-  updated_at: 2004-05-02 20:00:02
-  published_at: 2004-05-02 20:00:02
-  published: true
-  state: ContentState::Ham
-
 second_blog_article:
   type: Article
   blog_id: 2
   id: 16
   title: Second Blog Article
   body: body
-  body_html: body
   extended: extended content
-  extended_html: extended content
   allow_comments: true
   allow_pings: true
   permalink: second-blog-article
@@ -286,9 +163,7 @@ search_target:
   id: 17
   title: Find me!
   body: search target
-  body_html: body
   extended: extended content
-  extended_html: extended content
   allow_comments: true
   allow_pings: true
   permalink: second-blog-article
@@ -308,7 +183,6 @@ xmltest:
   title: Associations aren't :dependent => true anymore
   body: originally seen on <a href="http://blog.rubyonrails.org/">blog.rubyonrails.org</a>
   extended: extended content
-  extended_html: extended content
   allow_comments: true
   allow_pings: true
   permalink: associations-arent-dependent-true-anymore
@@ -327,7 +201,6 @@ spammed_article:
   id: 19
   title: C'mon Spam Me!
   body: A bunch of innocuous content
-  body_html: <p>A bunch of innocuous content</p>
   allow_comments: true
   allow_pings: true
   permalink: cmon-spam-me
@@ -340,34 +213,3 @@ spammed_article:
   published: true
   state: ContentState::Published
 
-probably_spam_comment:
-  type: Comment
-  blog_id: 1
-  id: 20
-  published: false
-  article_id: 19
-  author: Bob Foo
-  url: http://fakeurl.com
-  body: Test <a href="http://fakeurl.co.uk">body</a>
-  created_at: 2005-01-01 02:00:00
-  updated_at: 2005-01-01 02:00:00
-  published_at: 2005-01-01 02:00:00
-  guid: 12313123123123124
-  state: ContentState::PresumedSpam
-  status_confirmed: false
-
-definitely_spam_comment:
-  type: Comment
-  blog_id: 1
-  id: 21
-  published: false
-  article_id: 19
-  author: Bob Foo
-  url: http://fakeurl.com
-  body: Test <a href="http://fakeurl.co.uk">body</a>
-  created_at: 2005-01-01 02:00:01
-  updated_at: 2005-01-01 02:00:01
-  published_at: 2005-01-01 02:00:01
-  guid: 12313123123123125
-  state: ContentState::Spam
-  status_confirmed: true