typo 5.4.1 → 5.4.2

data/script/about

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/about'
+require File.expand_path('../../config/boot',  __FILE__)
+$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
+require 'commands/about'

data/script/console

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/console'

data/script/dbconsole

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/dbconsole'

data/script/destroy

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/destroy'

data/script/generate

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/generate'

data/script/performance/benchmarker

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path('../../../config/boot',  __FILE__)
 require 'commands/performance/benchmarker'

data/script/performance/profiler

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path('../../../config/boot',  __FILE__)
 require 'commands/performance/profiler'

data/script/plugin

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/plugin'
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/plugin'

data/script/runner

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/runner'
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/runner'

data/script/server

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/server'
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/server'

data/spec/controllers/accounts_controller_spec.rb

@@ -150,6 +150,26 @@ describe 'GET /login' do
   end
 end
 
+describe 'GET /login with 0 existing users' do
+  controller_name :accounts
+
+  before(:each) do
+    User.stub!(:count).and_return(0)
+  end
+
+  it 'should render action :signup' do
+    get 'login'
+    response.should redirect_to(:action => 'signup')
+    assigns[:login].should be_nil
+  end
+
+  it 'should render :signup' do
+    get 'recover_password'
+
+    response.should redirect_to(:action => 'signup')
+  end
+end
+
 describe 'GET signup and >0 existing user' do
   controller_name :accounts
 
@@ -283,3 +303,30 @@ describe 'User is logged in' do
     cookies[:typo_user_profile].should == nil
   end
 end
+
+describe 'User has lost his password and send a good email' do
+  controller_name :accounts
+  
+  before(:each) do
+    @user = mock_model(User, :new_record? => false, :reload => @user)
+    @user.stub!(:profile).and_return(Profile.find_by_label('admin'))
+    User.stub!(:find_by_login).with('tobi').and_return(@user)
+    User.stub!(:count).and_return(1)
+  end
+  
+  it 'should render recover_password' do
+    get 'recover_password'
+    
+    response.should render_template('recover_password')
+  end
+  
+  it 'should render login' do
+    make_request
+    
+    response.should redirect_to(:action => 'login')
+  end
+  
+  def make_request
+   post 'recover_password', {:user => {:login => 'tobi'}}
+  end
+end

data/spec/controllers/admin/content_controller_spec.rb

@@ -155,6 +155,10 @@ describe Admin::ContentController do
 
     it 'should create' do
       begin
+        u = users(:randomuser)
+        u.notify_via_email = true
+        u.notify_on_new_articles = true
+        u.save!
         ActionMailer::Base.perform_deliveries = true
         ActionMailer::Base.deliveries = []
         category = Factory(:category)

data/spec/controllers/admin/resources_controller_spec.rb

@@ -13,6 +13,14 @@ describe Admin::ResourcesController do
     assert_not_nil assigns(:resources)
   end
 
+  it "test_images" do
+    get :images
+    assert_response :success
+    assert_template 'images'
+    assert_template_has 'resources'
+    assert_not_nil assigns(:resources)
+  end
+
   it "test_destroy" do
     res_id = resources(:resource1).id
     assert_not_nil Resource.find(res_id)

data/spec/controllers/xml_controller_spec.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-require 'xml_controller'
 require 'dns_mock'
 
 describe XmlController do
@@ -11,10 +10,7 @@ describe XmlController do
   end
 
   before do
-    Article.create!(:title => "News from the future!",
-                    :body => "The future is cool!",
-                    :keywords => "future",
-                    :created_at => Time.now + 12.minutes)
+    @article = Factory.create(:article)
   end
 
   def assert_moved_permanently_to(location)
@@ -42,8 +38,8 @@ describe XmlController do
     end
 
     it "redirects article feed to Article RSS feed" do
-      get :feed, :type => 'article', :id => contents(:article1).id
-      assert_moved_permanently_to contents(:article1).permalink_by_format(:rss)
+      get :feed, :type => 'article', :id => @article.id
+      assert_moved_permanently_to @article.permalink_by_format(:rss)
     end
 
     it "redirects category feed to Category RSS feed" do
@@ -76,8 +72,8 @@ describe XmlController do
   end
 
   it "test_feed_rss20_article" do
-    get :feed, :format => 'rss20', :type => 'article', :id => contents(:article1).id
-    assert_moved_permanently_to contents(:article1).permalink_by_format(:rss)
+    get :feed, :format => 'rss20', :type => 'article', :id => @article.id
+    assert_moved_permanently_to @article.permalink_by_format(:rss)
   end
 
   it "test_feed_rss20_category" do
@@ -118,8 +114,8 @@ describe XmlController do
   end
 
   it "test_feed_atom10_article" do
-    get :feed, :format => 'atom10', :type => 'article', :id => contents(:article1).id
-    assert_moved_permanently_to contents(:article1).permalink_by_format('atom')
+    get :feed, :format => 'atom10', :type => 'article', :id => @article.id
+    assert_moved_permanently_to @article.permalink_by_format('atom')
   end
 
   it "test_feed_atom10_category" do
@@ -133,7 +129,7 @@ describe XmlController do
   end
 
   it "test_articlerss" do
-    get :articlerss, :id => contents(:article1).id
+    get :articlerss, :id => @article.id
     assert_response :redirect
   end
 
@@ -147,6 +143,11 @@ describe XmlController do
     assert_response :redirect
   end
 
+  it "test_bad_format" do
+    get :feed, :format => 'atom04', :type => 'feed'
+    assert_response :missing
+  end
+
   it "test_bad_type" do
     get :feed, :format => 'rss20', :type => 'foobar'
     assert_response :missing
@@ -188,8 +189,4 @@ describe XmlController do
   def assert_atom10
     assert_select 'feed:root[xmlns="http://www.w3.org/2005/Atom"] > entry', :count => assigns(:items).size
   end
-
-  def set_extended_on_rss(value)
-    this_blog.show_extended_on_rss = value
-  end
 end

data/spec/factories.rb

@@ -4,18 +4,29 @@ Factory.sequence :user do |n|
   "user#{n}"
 end
 
+Factory.sequence :guid do |n|
+  "deadbeef#{n}"
+end
+
 Factory.define :user do |u|
   u.login { Factory.next(:user) }
   u.email 'some.where@out.there'
+  u.notify_via_email false
+  u.notify_on_new_articles false
+  u.notify_watch_my_articles false
+  u.notify_on_comments false
   u.password 'top-secret'
 end
 
 Factory.define :article do |a|
   a.title 'A big article'
   a.body 'A content with several data'
+  a.guid { Factory.next(:guid) }
   a.permalink 'a-big-article'
   a.published_at Time.now
-  a.association :user, :factory => :user
+  # Using an existing user avoids the password reminder mail overhead
+  a.user { User.find(:first) }
+  #a.association :user, :factory => :user
 end
 
 Factory.define :second_article, :parent => :article do |a|
@@ -31,6 +42,8 @@ Factory.define :article_with_accent_in_html, :parent => :article do |a|
 end
 
 Factory.define :blog do |b|
+  b.base_url 'http://myblog.net'
+  b.blog_name 'test blog'
 end
 
 Factory.define :profile_admin, :class => :profile do |l|

data/spec/models/article_spec.rb

@@ -2,7 +2,6 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Article do
 
-
   before do
     @articles = []
   end
@@ -22,9 +21,10 @@ describe Article do
     end
     it 'should store user too' do
       a = Factory(:article)
+      a.user.should be_valid
       Article.find(a.id).user.should_not be_nil
     end
-    it 'should multiple article factory valid' do
+    it 'should create multiple valid articles' do
       Factory(:article).should be_valid
       Factory(:article).should be_valid
     end
@@ -42,8 +42,12 @@ describe Article do
     assert_equal [:body, :extended], a.content_fields
   end
 
-  it "test_permalink_url" do
-    assert_equal 'http://myblog.net/2004/06/01/article-3', contents(:article3).permalink_url(anchor=nil, only_path=true)
+  it "test_permalink_url with hostname" do
+    assert_equal 'http://myblog.net/2004/06/01/article-3', contents(:article3).permalink_url(anchor=nil, only_path=false)
+  end
+
+  it "test_permalink_url only path" do
+    assert_equal '/2004/06/01/article-3', contents(:article3).permalink_url(anchor=nil, only_path=true)
   end
 
   it "test_edit_url" do
@@ -115,9 +119,39 @@ describe Article do
     assert_equal '%E3%83%AB%E3%83%93%E3%83%BC', a.permalink
   end
 
-  it "test_urls" do
-    urls = contents(:article4).html_urls
-    assert_equal ["http://www.example.com/public"], urls
+  describe "the html_urls method" do
+    it "test_urls" do
+      urls = contents(:article4).html_urls
+      assert_equal ["http://www.example.com/public"], urls
+    end
+
+    it "should only match the href attribute" do
+      a = Factory.create :article
+      a.body = '<a href="http://a/b">a</a> <a fhref="wrong">wrong</a>'
+      urls = a.html_urls
+      assert_equal ["http://a/b"], urls
+    end
+
+    it "should match across newlines" do
+      a = Factory.create :article
+      a.body = "<a\nhref=\"http://foo/bar\">foo</a>"
+      urls = a.html_urls
+      assert_equal ["http://foo/bar"], urls
+    end
+
+    it "should match with single quotes" do
+      a = Factory.create :article
+      a.body = "<a href='http://foo/bar'>foo</a>"
+      urls = a.html_urls
+      assert_equal ["http://foo/bar"], urls
+    end
+
+    it "should match with no quotes" do
+      a = Factory.create :article
+      a.body = "<a href=http://foo/bar>foo</a>"
+      urls = a.html_urls
+      assert_equal ["http://foo/bar"], urls
+    end
   end
 
   ### XXX: Should we have a test here?
@@ -266,6 +300,9 @@ describe Article do
   end
 
   it 'should notify' do
+    [:randomuser, :bob].each do |tag|
+      u = users(tag); u.notify_on_new_articles = true; u.save!
+    end
     a = Article.new(:title => 'New Article', :body => 'Foo', :author => 'Tobi', :user => users(:tobi))
     assert a.save
 
@@ -428,21 +465,27 @@ describe Article do
 
   describe '#published_at_like' do
     before do
-      @article_last_month = Factory(:article, :published_at => 1.month.ago)
-      @article_2_last_month = Factory(:article, :published_at => 1.month.ago)
-
+      # Note: these choices of times depend on no other articles within
+      # these timeframes existing in test/fixtures/contents.yaml.
+      # In particular, all articles there are from 2005 or earlier, which
+      # is now more than two years ago, except for two, which are from
+      # yesterday and the day before. The existence of those two makes
+      # 1.month.ago not suitable, because yesterday can be last month.
       @article_two_month_ago = Factory(:article, :published_at => 2.month.ago)
-      @article_2_two_month_ago = Factory(:article, :published_at => (2.month.ago - 1.day))
+
+      @article_four_months_ago = Factory(:article, :published_at => 4.month.ago)
+      @article_2_four_months_ago = Factory(:article, :published_at => 4.month.ago)
+
       @article_two_year_ago = Factory(:article, :published_at => 2.year.ago)
       @article_2_two_year_ago = Factory(:article, :published_at => 2.year.ago)
     end
 
-    it 'should return all content on this year if year send' do
+    it 'should return all content for the year if only year sent' do
       Article.published_at_like(2.year.ago.strftime('%Y')).map(&:id).sort.should == [@article_two_year_ago.id, @article_2_two_year_ago.id].sort
     end
 
-    it 'should return all content on this month if month send' do
-      Article.published_at_like(1.month.ago.strftime('%Y-%m')).map(&:id).sort.should == [@article_last_month.id, @article_2_last_month.id].sort
+    it 'should return all content for the month if year and month sent' do
+      Article.published_at_like(4.month.ago.strftime('%Y-%m')).map(&:id).sort.should == [@article_four_months_ago.id, @article_2_four_months_ago.id].sort
     end
 
     it 'should return all content on this date if date send' do

data/spec/models/blog_spec.rb

@@ -1,7 +1,11 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Given the first Blog fixture" do
-  before(:each) { @blog = blogs(:default) }
+  before(:each) {
+    Blog.destroy_all
+    RouteCache.clear
+    @blog = Factory.create :blog
+  }
 
   it ":blog_name == 'test blog'" do
     @blog.blog_name.should == 'test blog'
@@ -16,10 +20,53 @@ describe "Given the first Blog fixture" do
     end
   end
 
-  it "blog.url_for does the right thing" do
-    @blog.url_for(:controller => 'articles', :action => 'read', :id => 1).should == 'http://myblog.net/articles/read/1'
+  describe "running in the host root" do
+    it ":base_url == 'http://myblog.net/'" do
+      @blog.base_url.should == 'http://myblog.net'
+    end
+
+    describe "blog.url_for" do
+      it "should return the correct URL for a hash argument" do
+        @blog.url_for(:controller => 'articles', :action => 'read', :id => 1).should == 'http://myblog.net/articles/read/1'
+      end
+      it "should return the correct URL for a hash argument with only_path" do
+        @blog.base_url.should == 'http://myblog.net'
+        @blog.url_for(:controller => 'articles', :action => 'read', :id => 1,
+                     :only_path => true).should == '/articles/read/1'
+      end
+      it "should return the correct URL for a string argument" do
+        @blog.url_for('articles/read/1').should == 'http://myblog.net/articles/read/1'
+      end
+      it "should return the correct URL for a hash argument with only_path" do
+        @blog.url_for('articles/read/1', :only_path => true).should == '/articles/read/1'
+      end
+    end
   end
 
+  describe "running in a sub-URI" do
+    before :each do
+      @blog.base_url = 'http://myblog.net/sub-uri'
+    end
+
+    describe "blog.url_for" do
+      it "should return the correct URL for a hash argument" do
+        @blog.url_for(:controller => 'articles', :action => 'read',
+                      :id => 1).should == 'http://myblog.net/sub-uri/articles/read/1'
+      end
+      it "should return the correct URL for a hash argument with only_path" do
+        @blog.url_for(:controller => 'articles', :action => 'read', :id => 1,
+                     :only_path => true).should == '/sub-uri/articles/read/1'
+      end
+      it "should return the correct URL for a string argument" do
+        @blog.url_for('articles/read/1'
+                     ).should == 'http://myblog.net/sub-uri/articles/read/1'
+      end
+      it "should return the correct URL for a hash argument with only_path" do
+        @blog.url_for('articles/read/1',
+                      :only_path => true).should == '/sub-uri/articles/read/1'
+      end
+    end
+  end
   it "should be the only blog allowed" do
     Blog.new.should_not be_valid
   end