typo 5.3 → 5.4

data/spec/models/blacklist_pattern_spec.rb

@@ -6,7 +6,7 @@ describe BlacklistPattern, 'from Test::Unit' do
   end
 
   # Replace this with your real tests.
-  def test_truth
+  it "test_truth" do
     assert_kind_of BlacklistPattern,  @blacklist_pattern
   end
 end

data/spec/models/blog_spec.rb

@@ -28,7 +28,6 @@ end
 describe "The default blog" do
   it "should pick up updates after a cache clear" do
     a = Blog.default
-    CachedModel.cache_reset
     b = blogs(:default)
     b.blog_name = "some other name"
     c = Blog.default

data/spec/models/comment_spec.rb

@@ -11,10 +11,6 @@ describe Comment do
                 :ip => '1.2.3.4'}.merge(options))
   end
 
-  before(:each) do
-    CachedModel.cache_reset
-  end
-
   describe '#permalink_url' do
     it 'should render permalink to comment in public part' do
       c = feedback(:old_comment)

data/spec/models/configuration_spec.rb

@@ -73,7 +73,7 @@ describe 'Given a new blog' do
   end
 
   it '#theme should be "typographic"' do
-    @blog.theme.should == 'typographic'
+    @blog.theme.should == 'true-blue-3'
   end
 
   it 'should not use gravatar' do

data/spec/models/content_state/feedback_states_spec.rb

@@ -6,7 +6,7 @@ describe 'FeedbackStates from Test::Unit' do
                                                   :body => 'Body')
   end
 
-  def test_ham_all_the_way
+  it "test_ham_all_the_way" do
     assert @comment.unclassified?
     assert   @comment.published?
     assert   @comment.just_published?
@@ -23,7 +23,7 @@ describe 'FeedbackStates from Test::Unit' do
     assert ! @comment.just_changed_published_status?
   end
 
-  def test_spam_all_the_way
+  it "test_spam_all_the_way" do
     class << @comment
       def classify
         :spam
@@ -46,7 +46,7 @@ describe 'FeedbackStates from Test::Unit' do
     assert ! @comment.just_changed_published_status?
   end
 
-  def test_presumed_spam_marked_as_ham
+  it "test_presumed_spam_marked_as_ham" do
     @comment[:state] = 'presumed_spam'
     @comment.mark_as_ham
     assert @comment.published?
@@ -54,7 +54,7 @@ describe 'FeedbackStates from Test::Unit' do
     assert @comment.just_changed_published_status?
   end
 
-  def test_presumed_ham_marked_as_spam
+  it "test_presumed_ham_marked_as_spam" do
     @comment[:state] = 'presumed_ham'
     @comment.mark_as_spam
     assert ! @comment.published?

data/spec/models/notification_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + "/../spec_helper"
 
-class NotificationTest < Test::Unit::TestCase
+describe Notification do
   # Replace this with your real tests.
-  def test_truth
+  it "test_truth" do
     assert true
   end
 end

data/spec/models/ping_pinger_spec.rb

@@ -9,7 +9,7 @@ describe 'Ping::Pinger with Test::Unit' do
     end
   end
 
-  def test_pingback_url_nil
+  it "test_pingback_url_nil" do
     @pinger.response = mock('response')
     @pinger.response.stub!(:body).and_return('')
     @pinger.response.stub!(:[]).and_return(nil)
@@ -17,14 +17,14 @@ describe 'Ping::Pinger with Test::Unit' do
   end
 
   # TODO: why do we assume that we can XML attribute order?
-  def test_pingback_url_from_body
+  it "test_pingback_url_from_body" do
     @pinger.response = mock('response')
     @pinger.response.stub!(:body).and_return('<link rel="pingback" href="foo" />')
     @pinger.response.stub!(:[]).and_return(nil)
     assert_equal 'foo', @pinger.pingback_url
   end
 
-  def test_pingback_url
+  it "test_pingback_url" do
     @pinger.response = mock('response')
     @pinger.response.stub!(:body).and_return('')
     @pinger.response.stub!(:[]).and_return(:x_pingback)

data/spec/models/ping_spec.rb

@@ -75,28 +75,54 @@ end
 describe "An article links to another article, which contains a trackback URL" do
   def referenced_url;  'http://anotherblog.org/a-post'; end
   def trackback_url;  "http://anotherblog.org/a-post/trackback"; end
-  def referrer_url;  'http://myblog.net/referring-post'; end
 
-  def expected_trackback_post_data
-    "title=Article+1%21&excerpt=body&url=http://myblog.net/referring-post&blog_name=test+blog"
-  end
 
   it 'Trackback URL is detected and pinged' do
+    referrer_url = 'http://myblog.net/referring-post'
+    post = "title=Article+1%21&excerpt=body&url=http://myblog.net/referring-post&blog_name=test+blog"
+    make_and_send_ping(post, contents(:article1), referrer_url)
+  end
+
+  it 'sends a trackback without html tag in excerpt' do
+    # TODO: Assert the following:
+    # contents(:xmltest).body = originally seen on <a href="http://blog.rubyonrails.org/">blog.rubyonrails.org</a>
+
+    post = "title=#{CGI.escape("Associations aren't :dependent => true anymore")}"
+    post << "&excerpt=#{CGI.escape("originally seen on blog.rubyonrails.org")}" # not original text see if normal ?
+    post << "&url=#{contents(:xmltest).permalink_url}"
+    post << "&blog_name=#{CGI.escape('test blog')}"
+
+    make_and_send_ping(post, contents(:xmltest), contents(:xmltest).permalink_url)
+  end
+
+  it 'sends a trackback without markdown tag in excerpt' do
+    # TODO: Assert the following:
+    # contents(:markdown_article) #in markdown format\n * we\n * use\n [ok](http://blog.ok.com) to define a link
+
+    post = "title=#{CGI.escape("How made link with markdown")}"
+    post << "&excerpt=#{CGI.escape("in markdown format we use ok to define a link")}" # not original text see if normal ?
+    post << "&url=#{contents(:markdown_article).permalink_url}"
+    post << "&blog_name=#{CGI.escape('test blog')}"
+
+    make_and_send_ping(post, contents(:markdown_article), contents(:markdown_article).permalink_url)
+  end
+
+  def make_and_send_ping(post, article, article_url)
     @mock = mock('html_response')
     Net::HTTP.should_receive(:get_response).with(URI.parse(referenced_url)).and_return(@mock)
     @mock.should_receive(:[]).with('X-Pingback').at_least(:once)
     @mock.should_receive(:body).twice.and_return(referenced_body)
     Net::HTTP.should_receive(:start).with(URI.parse(trackback_url).host, 80).and_yield(@mock)
+
     @mock.should_receive(:post) \
-      .with('/a-post/trackback', expected_trackback_post_data,
+      .with('/a-post/trackback', post,
             'Content-type' => 'application/x-www-form-urlencoded; charset=utf-8') \
       .and_return(@mock)
 
-    ping = contents(:article1).pings.build(:url => referenced_url)
-    ping.send_pingback_or_trackback(referrer_url)
+    ping = article.pings.build(:url => referenced_url)
+    ping.send_pingback_or_trackback(article_url)
   end
 
-
   def referenced_body
     <<-eobody
     <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -126,42 +152,3 @@ describe 'Given a remote site to notify, eg technorati' do
     ping.send_weblogupdatesping('http://myblog.net', 'http://myblog.net/new-post')
   end
 end
-
-describe Ping do
-
-  describe '#send_trackback' do
-
-    it 'should send a trackback without html tag in excerpt' do
-      # contents(:xmltest).body = originally seen on <a href="http://blog.rubyonrails.org/">blog.rubyonrails.org</a>
-      ping = Ping.new(:article_id => contents(:xmltest).id,
-                      :url => 'http://github.com/fdv/typo')
-
-      post = "title=#{CGI.escape("Associations aren't :dependent => true anymore")}"
-      post << "&excerpt=#{CGI.escape("originally seen on blog.rubyonrails.org")}" # not original text see if normal ?
-      post << "&url=#{contents(:xmltest).permalink_url}"
-      post << "&blog_name=#{CGI.escape('test blog')}"
-
-      net_http = mock(Net::HTTP)
-      net_http.should_receive(:post).with('/fdv/typo', post,'Content-type' => 'application/x-www-form-urlencoded; charset=utf-8')
-      Net::HTTP.should_receive(:start).with('github.com', 80).and_yield(net_http)
-      ping.send_trackback('http://github.com/fdv/typo', contents(:xmltest).permalink_url)
-    end
-
-    it 'should send a trackback without markdown tag in excerpt' do
-      # contents(:markdown_article) #in markdown format\n * we\n * use\n [ok](http://blog.ok.com) to define a link
-      ping = Ping.new(:article_id => contents(:markdown_article).id,
-                      :url => 'http://github.com/fdv/typo')
-
-      post = "title=#{CGI.escape("How made link with markdown")}"
-      post << "&excerpt=#{CGI.escape("in markdown format we use ok to define a link")}" # not original text see if normal ?
-      post << "&url=#{contents(:markdown_article).permalink_url}"
-      post << "&blog_name=#{CGI.escape('test blog')}"
-
-      net_http = mock(Net::HTTP)
-      net_http.should_receive(:post).with('/fdv/typo', post,'Content-type' => 'application/x-www-form-urlencoded; charset=utf-8')
-      Net::HTTP.should_receive(:start).with('github.com', 80).and_yield(net_http)
-      ping.send_trackback('http://github.com/fdv/typo', contents(:markdown_article).permalink_url)
-    end
-
-  end
-end

data/spec/models/route_cache_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + "/../spec_helper"
 
-class RouteCacheTest < Test::Unit::TestCase
+describe RouteCache do
 
-  def test_cache_clear
+  it "test_cache_clear" do
     RouteCache[:foo] = :bar
     RouteCache.clear
     assert_equal({}, RouteCache.instance_variable_get(:@cache))

data/spec/models/sidebar_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + "/../spec_helper"
 
-class SidebarTest < Test::Unit::TestCase
-  def test_available_sidebars
+describe Sidebar do
+  it "test_available_sidebars" do
     assert Sidebar.available_sidebars.size >= 6
   end
 end

data/spec/models/theme_spec.rb

@@ -5,12 +5,12 @@ describe 'Given a new test theme' do
     @theme = Theme.new("test", "test")
   end
 
-  it 'layout path should be "../../themes/test/layouts/default.html.erb"'  do
-    @theme.layout.should == "../../themes/test/layouts/default.html.erb"
-  end
+  it 'layout path should be "#{RAILS_ROOT}/themes/test/layouts/default.html.erb"'  do
+    @theme.layout('index').should == "#{RAILS_ROOT}/themes/test/layouts/default.html.erb"
+  end  
 end
 
-describe 'Given a the default theme' do
+describe 'Given the default theme' do
   before(:each) do
     @theme = Blog.default.current_theme
   end

data/spec/models/trigger_spec.rb

@@ -7,6 +7,7 @@ describe 'With the contents fixture' do
     @page.stub!(:type).and_return('Page')
     @page.stub!(:new_record?).and_return(false)
     @page.stub!(:class).and_return(Page)
+    @page.stub!(:destroyed?).and_return(false)
     Content.stub!(:find).and_return(@page)
     @current_utime = 1
     Time.stub!(:now).and_return { Time.at(@current_utime) }

data/spec/models/user_spec.rb

@@ -40,50 +40,47 @@ describe 'With a new user' do
     set_password 'a secure password'
   end
 
-  it 'password cannot be too short' do
-    set_password 'tiny'
-    @user.should_not be_valid
-    @user.errors.should be_invalid('password')
-  end
-
-  it 'password cannot be too long' do
-    set_password 'x' * 80
-    @user.should_not be_valid
-    @user.errors.should be_invalid('password')
-  end
-
-  it 'password cannot be blank' do
-    set_password ''
-    @user.should_not be_valid
-    @user.errors.should be_invalid('password')
-  end
-
-  it 'password can be just right' do
-    set_password 'Just right'
-    @user.should be_valid
-  end
+  describe "the password" do
+    it 'can be just right' do
+      set_password 'Just right'
+      @user.should be_valid
+    end
 
-  it 'login cannot be too short' do
-    @user.login = 'x'
-    @user.should_not be_valid
-    @user.errors.should be_invalid('login')
-  end
+    { 'too short' => 'x',
+      'too long' => 'repetitivepass' * 10,
+      'empty' => ''
+    }.each do |problematic, password|
+      it "cannot be #{problematic}" do
+        set_password password
+        @user.should_not be_valid
+        @user.errors.should be_invalid('password')
+      end
+    end
 
-  it 'login cannot be too long' do
-    @user.login = 'repetitivebob' * 10
-    @user.should_not be_valid
-    @user.errors.should be_invalid('login')
+    it "has to match confirmation" do
+      @user.password = "foo"
+      @user.password_confirmation = "bar"
+      @user.should_not be_valid
+      @user.errors.should be_invalid('password')
+    end
   end
 
-  it 'login cannot be blank' do
-    @user.login = ''
-    @user.should_not be_valid
-    @user.errors.should be_invalid('login')
-  end
+  describe 'the login' do
+    it 'can be just right' do
+      @user.login = 'okbob'
+      @user.should be_valid
+    end
 
-  it 'login can be just right' do
-    @user.login = 'okbob'
-    @user.should be_valid
+    { 'too short' => 'x',
+      'too long' => 'repetitivepass' * 10,
+      'empty' => ''
+    }.each do |problematic, login|
+      it "cannot be #{problematic}" do
+        @user.login = login
+        @user.should_not be_valid
+        @user.errors.should be_invalid('login')
+      end
+    end
   end
 
   it 'email cannot be blank' do
@@ -113,6 +110,62 @@ describe 'With a user, "bob" in the database' do
   end
 end
 
+describe 'Updating an existing user' do
+  before(:each) do
+    User.delete_all
+    @user = User.new :login => 'bob'
+    @user.email = 'typo@typo.com'
+    set_password 'a secure password'
+    @user.save!
+  end
+
+  describe "the password" do
+    { 'just right' => 'Just right',
+      'empty' => ''
+    }.each do |ok, password|
+      it "can be #{ok}" do
+        set_password password
+        @user.should be_valid
+      end
+    end
+
+    { 'too short' => 'x',
+      'too long' => 'repetitivepass' * 10,
+    }.each do |problematic, password|
+      it "cannot be #{problematic}" do
+        set_password password
+        @user.should_not be_valid
+        @user.errors.should be_invalid('password')
+      end
+    end
+
+    it "has to match confirmation" do
+      @user.password = "foo"
+      @user.password_confirmation = "bar"
+      @user.should_not be_valid
+      @user.errors.should be_invalid('password')
+    end
+
+    it "is not actually changed when set to empty" do
+      set_password ''
+      @user.save!
+      User.authenticate('bob', '').should be_nil
+      User.authenticate('bob', 'a secure password').should == @user
+    end
+  end
+
+  describe 'the login' do
+    it 'must not change' do
+      @user.login = 'not_bob'
+      @user.should_not be_valid
+    end
+  end
+
+  def set_password(newpass)
+    @user.password = @user.password_confirmation = newpass
+  end
+end
+
 describe User do
   describe '#admin?' do
 

data/spec/rcov.opts

@@ -0,0 +1,2 @@
+--exclude "spec/*,gems/*" 
+--rails

data/spec/spec_helper.rb

@@ -1,35 +1,22 @@
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'spec'
+ENV["RAILS_ENV"] ||= 'test'
+require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
+require 'spec/autorun'
 require 'spec/rails'
 
 Spec::Runner.configure do |config|
   config.use_transactional_fixtures = true
   config.use_instantiated_fixtures  = false
-  config.fixture_path = RAILS_ROOT + '/test/fixtures'
+  config.fixture_path = RAILS_ROOT + '/test/fixtures/'
   config.global_fixtures =
     %w{ blacklist_patterns blogs categories categorizations contents
         feedback notifications page_caches profiles redirects resources sidebars
         tags text_filters triggers users }
 
   config.before(:each) do
-    CachedModel.cache_reset
     Localization.lang = :default
   end
-
-  # You can declare fixtures for each behaviour like this:
-  #   describe "...." do
-  #     fixtures :table_a, :table_b
-  #
-  # Alternatively, if you prefer to declare them only once, you can
-  # do so here, like so ...
-  #
-  #   config.global_fixtures = :table_a, :table_b
-  #
-  # If you declare global fixtures, be aware that they will be declared
-  # for all of your examples, even those that don't use them.
 end
 
 def define_spec_public_cache_directory
@@ -39,9 +26,95 @@ def define_spec_public_cache_directory
   end
 end
 
-def create_file_in_spec_public_cache_directory(file)
+def path_for_file_in_spec_public_cache_directory(file)
   define_spec_public_cache_directory
-  file_path = File.join(ActionController::Base.page_cache_directory, file)
+  File.join(ActionController::Base.page_cache_directory, file)
+end
+
+def create_file_in_spec_public_cache_directory(file)
+  file_path = path_for_file_in_spec_public_cache_directory(file)
   File.open(file_path, 'a').close
   file_path
 end
+
+# TODO: Rewrite to be more RSpec-like instead of Test::Unit-like.
+def assert_template_has(key=nil, message=nil)
+  msg = build_message(message, "<?> is not a template object", key)
+  assert_block(msg) { @response.has_template_object?(key) }
+end
+
+def assert_xml(xml)
+  assert_nothing_raised do
+    assert REXML::Document.new(xml)
+  end
+end
+
+def this_blog
+  Blog.default || Blog.create!
+end
+
+# This test now has optional support for validating the generated RSS feeds.
+# Since Ruby doesn't have a RSS/Atom validator, I'm using the Python source
+# for http://feedvalidator.org and calling it via 'system'.
+#
+# To install the validator, download the source from
+# http://sourceforge.net/cvs/?group_id=99943
+# Then copy src/feedvalidator and src/rdflib into a Python lib directory.
+# Finally, copy src/demo.py into your path as 'feedvalidator', make it executable,
+# and change the first line to something like '#!/usr/bin/python'.
+
+if($validator_installed == nil)
+  $validator_installed = false
+  begin
+    IO.popen("feedvalidator 2> /dev/null","r") do |pipe|
+      if (pipe.read =~ %r{Validating http://www.intertwingly.net/blog/index.})
+        puts "Using locally installed Python feed validator"
+        $validator_installed = true
+      end
+    end
+  rescue
+    nil
+  end
+end
+
+def assert_feedvalidator(rss, todo=nil)
+  unless $validator_installed
+    puts 'not test of validating feed because no validator (feedvalidator in python) installed'
+    return
+  end
+
+  begin
+    file = Tempfile.new('typo-feed-test')
+    filename = file.path
+    file.write(rss)
+    file.close
+
+    messages = ''
+
+    IO.popen("feedvalidator file://#{filename}") do |pipe|
+      messages = pipe.read
+    end
+
+    okay, messages = parse_validator_messages(messages)
+
+    if todo && ! ENV['RUN_TODO_TESTS']
+      assert !okay, messages + "\nTest unexpectedly passed!\nFeed text:\n"+rss
+    else
+      assert okay, messages + "\nFeed text:\n"+rss
+    end
+  end
+end
+
+def parse_validator_messages(message)
+  messages=message.split(/\n/).reject do |m|
+    m =~ /Feeds should not be served with the "text\/plain" media type/ ||
+      m =~ /Self reference doesn't match document location/
+  end
+
+  if(messages.size > 1)
+    [false, messages.join("\n")]
+  else
+    [true, ""]
+  end
+end
+