@@ -5,18 +5,18 @@ describe Admin::BlacklistController do request.session = { :user => users(:tobi).id } end - def test_index + it "test_index" do get :index assert_template 'index' end - def test_list + it "test_list" do get :index assert_template 'index' assert_template_has 'blacklist_patterns' end - def test_create + it "test_create" do num_blacklist_patterns = BlacklistPattern.count post :new, 'blacklist_pattern' => { } @@ -25,19 +25,19 @@ describe Admin::BlacklistController do assert_equal num_blacklist_patterns + 1, BlacklistPattern.count end - def test_edit + it "test_edit" do get :edit, 'id' => blacklist_patterns(:first_blacklist_pattern).id assert_template 'edit' assert_template_has('blacklist_pattern') assert assigns(:blacklist_pattern).valid? end - def test_update + it "test_update" do post :edit, 'id' => blacklist_patterns(:first_blacklist_pattern).id assert_response :redirect, :action => 'index' end - def test_destroy + it "test_destroy" do pattern_id = blacklist_patterns(:first_blacklist_pattern).id assert_not_nil BlacklistPattern.find(pattern_id) spec/controllers/admin/blacklist_controller_spec.rb @@ -7,7 +7,7 @@ describe Admin::CategoriesController do request.session = { :user => users(:tobi).id } end - def test_index + it "test_index" do get :index assert_template 'index' assert_template_has 'categories' @@ -15,26 +15,26 @@ describe Admin::CategoriesController do :attributes => { :id => "category_container" } end - def test_create + it "test_create" do assert_difference 'Category.count' do post :edit, 'category' => { :name => "test category" } assert_response :redirect, :action => 'index' end end - def test_edit + it "test_edit" do get :edit, :id => categories(:software).id assert_template 'new' assert_template_has 'category' assert assigns(:category).valid? end - def test_update + it "test_update" do post :edit, :id => categories(:software).id assert_response :redirect, :action => 'index' end - def test_destroy + it "test_destroy" do test_id = categories(:software).id assert_not_nil Category.find(test_id) @@ -48,14 +48,14 @@ describe Admin::CategoriesController do assert_raise(ActiveRecord::RecordNotFound) { Category.find(test_id) } end - def test_order + it "test_order" do assert_equal categories(:software), Category.find(:first, :order => :position) get :order, :category_list => [categories(:personal).id, categories(:hardware).id, categories(:software).id] assert_response :success assert_equal categories(:personal), Category.find(:first, :order => :position) end - def test_asort + it "test_asort" do assert_equal categories(:software), Category.find(:first, :order => :position) get :asort assert_response :success @@ -63,7 +63,7 @@ describe Admin::CategoriesController do assert_equal categories(:hardware), Category.find(:first, :order => :position) end - def test_category_container + it "test_category_container" do get :category_container assert_response :success assert_template "_categories" @@ -74,7 +74,7 @@ describe Admin::CategoriesController do :only => { :tag => /t[dh]/ } } } } end - def test_reorder + it "test_reorder" do get :reorder assert_response :success assert_template "reorder" spec/controllers/admin/categories_controller_spec.rb @@ -25,7 +25,7 @@ describe Admin::PagesController do end - def test_show + it "test_show" do get :show, :id => contents(:first_page).id assert_response :success assert_template "show" @@ -33,7 +33,7 @@ describe Admin::PagesController do assert_equal contents(:first_page), assigns(:page) end - def test_new + it "test_new" do get :new assert_response :success assert_template "new" @@ -55,7 +55,7 @@ describe Admin::PagesController do #assert_equal "Page was successfully created.", flash[:notice] end - def test_edit + it "test_edit" do get :edit, :id => contents(:markdown_page).id assert_response :success assert_template "edit" @@ -72,7 +72,7 @@ describe Admin::PagesController do #assert_equal "Page was successfully updated.", flash[:notice] end - def test_destroy + it "test_destroy" do post :destroy, :id => contents(:another_page).id assert_response :redirect, :action => "list" assert_raise(ActiveRecord::RecordNotFound) { Page.find(contents(:another_page).id) } spec/controllers/admin/pages_controller_spec.rb @@ -5,7 +5,7 @@ describe Admin::ResourcesController do @request.session = { :user => users(:tobi).id } end - def test_index + it "test_index" do get :index assert_response :success assert_template 'index' @@ -13,7 +13,7 @@ describe Admin::ResourcesController do assert_not_nil assigns(:resources) end - def test_destroy + it "test_destroy" do res_id = resources(:resource1).id assert_not_nil Resource.find(res_id) @@ -26,7 +26,7 @@ describe Admin::ResourcesController do response.should redirect_to(:action => 'index') end - def test_upload + it "test_upload" do # unsure how to test upload constructs :'( end end spec/controllers/admin/resources_controller_spec.rb @@ -12,18 +12,18 @@ describe Admin::ThemesController, 'ported from the tests' do end # Replace this with your real tests. - def test_index + it "test_index" do get :index assert_response :success assert_not_nil assigns(:themes) end - def test_switchto + it "test_switchto" do get :switchto, :theme => 'typographic' assert_response :redirect, :action => 'index' end - def test_preview + it "test_preview" do get :preview, :theme => 'typographic' assert_response :success end spec/controllers/admin/themes_controller_spec.rb @@ -9,13 +9,13 @@ describe Admin::UsersController, "rough port of the old functional test" do request.session = { :user => users(:tobi).id } end - def test_index + it "test_index" do get :index assert_template 'index' assert_template_has 'users' end - def test_new + it "test_new" do get :new assert_template 'new' @@ -64,7 +64,7 @@ describe Admin::UsersController, "rough port of the old functional test" do end end - def test_destroy + it "test_destroy" do user_count = User.count get :destroy, :id => users(:bob).id assert_template 'destroy' spec/controllers/admin/users_controller_spec.rb @@ -19,28 +19,28 @@ describe BackendController do end # BloggerApi Tests - def test_blogger_delete_post + it "test_blogger_delete_post" do args = [ 'foo', contents(:article3).id, 'tobi', 'whatever', 1 ] result = invoke_layered :blogger, :deletePost, *args assert_raise(ActiveRecord::RecordNotFound) { Article.find(contents(:article3).id) } end - def test_blogger_get_users_blogs + it "test_blogger_get_users_blogs" do args = [ 'foo', 'tobi', 'whatever' ] result = invoke_layered :blogger, :getUsersBlogs, *args assert_equal 'test blog', result.first['blogName'] end - def test_blogger_get_user_info + it "test_blogger_get_user_info" do args = [ 'foo', 'tobi', 'whatever' ] result = invoke_layered :blogger, :getUserInfo, *args assert_equal 'tobi', result['userid'] end - def test_blogger_new_post + it "test_blogger_new_post" do args = [ 'foo', '1', 'tobi', 'whatever', '<title>new post title</title>new post *body*', 1] result = invoke_layered :blogger, :newPost, *args @@ -55,7 +55,7 @@ describe BackendController do assert new_post[:published_at] end - def test_blogger_new_post_no_title + it "test_blogger_new_post_no_title" do args = [ 'foo', '1', 'tobi', 'whatever', 'new post body for post without title but with a lenghty body', 1] result = invoke_layered :blogger, :newPost, *args @@ -66,7 +66,7 @@ describe BackendController do assert_equal "<p>new post body for post without title but with a lenghty body</p>", new_post.html(:body) end - def test_blogger_new_post_with_categories + it "test_blogger_new_post_with_categories" do args = [ 'foo', '1', 'tobi', 'whatever', '<title>new post title</title><category>Software, Hardware</category>new post body', 1] result = invoke_layered :blogger, :newPost, *args @@ -78,7 +78,7 @@ describe BackendController do assert new_post.published? end - def test_blogger_new_post_with_non_existing_categories + it "test_blogger_new_post_with_non_existing_categories" do args = [ 'foo', '1', 'tobi', 'whatever', '<title>new post title</title><category>Idontexist, Hardware</category>new post body', 1] result = invoke_layered :blogger, :newPost, *args @@ -87,28 +87,28 @@ describe BackendController do assert_equal [categories(:hardware)], new_post.categories end - def test_blogger_fail_authentication + it "test_blogger_fail_authentication" do args = [ 'foo', 'tobi', 'using a wrong password' ] # This will be a little more useful with the upstream changes in [1093] assert_raise(XMLRPC::FaultException) { invoke_layered :blogger, :getUsersBlogs, *args } end # Meta Weblog Tests - def test_meta_weblog_get_categories + it "test_meta_weblog_get_categories" do args = [ 1, 'tobi', 'whatever' ] result = invoke_layered :metaWeblog, :getCategories, *args assert_equal 'Software', result.first end - def test_meta_weblog_get_post + it "test_meta_weblog_get_post" do args = [ contents(:article1).id, 'tobi', 'whatever' ] result = invoke_layered :metaWeblog, :getPost, *args assert_equal result['title'], contents(:article1).title end - def test_meta_weblog_get_recent_posts + it "test_meta_weblog_get_recent_posts" do args = [ 1, 'tobi', 'whatever', 2 ] result = invoke_layered :metaWeblog, :getRecentPosts, *args @@ -116,7 +116,7 @@ describe BackendController do assert_equal result.last['title'], Article.find(:first, :offset => 1, :order => 'created_at desc').title end - def test_meta_weblog_delete_post + it "test_meta_weblog_delete_post" do art_id = contents(:article2).id args = [ 1, art_id, 'tobi', 'whatever', 1 ] @@ -124,7 +124,7 @@ describe BackendController do assert_raise(ActiveRecord::RecordNotFound) { Article.find(art_id) } end - def test_meta_weblog_edit_post + it "test_meta_weblog_edit_post" do art_id = contents(:article1).id article = Article.find(art_id) article.title = "Modified!" @@ -146,7 +146,7 @@ describe BackendController do end # TODO: Work out what the correct response is when a post can't be saved... - def test_meta_weblog_new_post_fails + it "test_meta_weblog_new_post_fails" do @article = Article.new(:title => 'test', :body => 'body', :extended => 'extended', :text_filter => TextFilter.find_by_name('textile'), :published_at => Time.now.utc.midnight) @@ -159,7 +159,7 @@ describe BackendController do 'Internal server error (exception raised)') end - def test_meta_weblog_new_post + it "test_meta_weblog_new_post" do article = Article.new article.title = "Posted via Test" article.body = "body" @@ -182,7 +182,7 @@ describe BackendController do assert_equal article.published_at, new_post.published_at.utc end - def test_meta_weblog_new_unpublished_post_with_blank_creation_date + it "test_meta_weblog_new_unpublished_post_with_blank_creation_date" do dto = MetaWeblogStructs::Article.new( :description => "Some text", :title => "A Title" @@ -196,7 +196,7 @@ describe BackendController do assert !new_post.published? end - def test_meta_weblog_edit_unpublished_post_with_old_creation_date + it "test_meta_weblog_edit_unpublished_post_with_old_creation_date" do article = Article.new article.title = "Posted via Test" article.body = "body" @@ -212,7 +212,7 @@ describe BackendController do assert !new_post.published? end - def test_meta_weblog_new_media_object + it "test_meta_weblog_new_media_object" do media_object = MetaWeblogStructs::MediaObject.new( "name" => Digest::SHA1.hexdigest("upload-test--#{Time.now}--") + ".gif", "type" => "image/gif", @@ -226,13 +226,13 @@ describe BackendController do assert File.unlink(File.expand_path(RAILS_ROOT) + "/public/files/#{media_object['name']}") end - def test_meta_weblog_fail_authentication + it "test_meta_weblog_fail_authentication" do args = [ 1, 'tobi', 'using a wrong password', 2 ] # This will be a little more useful with the upstream changes in [1093] assert_raise(XMLRPC::FaultException) { invoke_layered :metaWeblog, :getRecentPosts, *args } end - def test_meta_weblog_should_preserve_date_time_on_roundtrip_edit + it "test_meta_weblog_should_preserve_date_time_on_roundtrip_edit" do # The XML-RPC spec and the MetaWeblog API are ambiguous about how to # intrepret the timezone in the dateCreated field. But _however_ we # interpret it, we want to be able to fetch an article from the server, @@ -253,14 +253,14 @@ describe BackendController do # Movable Type Tests - def test_mt_get_category_list + it "test_mt_get_category_list" do args = [ 1, 'tobi', 'whatever' ] result = invoke_layered :mt, :getCategoryList, *args assert result.map { |c| c['categoryName'] }.include?('Software') end - def test_mt_get_post_categories + it "test_mt_get_post_categories" do art_id = contents(:article1).id article = Article.find(art_id) article.categories << categories(:software) @@ -271,14 +271,14 @@ describe BackendController do assert_equal Set.new(result.collect {|v| v['categoryName']}), Set.new(article.categories.collect(&:name)) end - def test_mt_get_recent_post_titles + it "test_mt_get_recent_post_titles" do args = [ 1, 'tobi', 'whatever', 2 ] result = invoke_layered :mt, :getRecentPostTitles, *args assert_equal result.first['title'], contents(:article2).title end - def test_mt_set_post_categories + it "test_mt_set_post_categories" do art_id = contents(:article2).id args = [ art_id, 'tobi', 'whatever', [MovableTypeStructs::CategoryPerPost.new('categoryName' => 'personal', 'categoryId' => categories(:personal).id, 'isPrimary' => 1)] ] @@ -296,19 +296,19 @@ describe BackendController do end - def test_mt_supported_text_filters + it "test_mt_supported_text_filters" do result = invoke_layered :mt, :supportedTextFilters assert result.map {|f| f['label']}.include?('Markdown') assert result.map {|f| f['label']}.include?('Textile') end - def test_mt_supported_methods + it "test_mt_supported_methods" do result = invoke_layered :mt, :supportedMethods assert_equal 8, result.size assert result.include?("publishPost") end - def test_mt_get_trackback_pings + it "test_mt_get_trackback_pings" do args = [ contents(:article1).id ] result = invoke_layered :mt, :getTrackbackPings, *args @@ -316,7 +316,7 @@ describe BackendController do assert_equal result.first['pingTitle'], 'Trackback Entry' end - def test_mt_publish_post + it "test_mt_publish_post" do art_id = contents(:article4).id args = [ art_id, 'tobi', 'whatever' ] @@ -329,7 +329,7 @@ describe BackendController do assert Article.find(art_id)[:published_at] end - def test_mt_fail_authentication + it "test_mt_fail_authentication" do args = [ 1, 'tobi', 'using a wrong password', 2 ] # This will be a little more useful with the upstream changes in [1093] assert_raise(XMLRPC::FaultException) { invoke_layered :mt, :getRecentPostTitles, *args } spec/controllers/backend_controller_spec.rb @@ -101,7 +101,7 @@ end ## Old tests that still need conversion -# def test_autodiscovery_category +# it "test_autodiscovery_category" do # get :category, :id => 'hardware' # assert_response :success # assert_select 'link[title=RSS]' do spec/controllers/categories_controller_spec.rb @@ -131,7 +131,7 @@ end ## Old tests that still need conversion -# def test_autodiscovery_tag +# it "test_autodiscovery_tag" do # get :tag, :id => 'hardware' # assert_response :success # assert_select 'link[title=RSS]' do spec/controllers/tags_controller_spec.rb @@ -25,17 +25,17 @@ describe TextfilterController do @whiteboard = nil end - def test_unknown + it "test_unknown" do text = filter_text('*foo*',[:unknowndoesnotexist]) assert_equal '*foo*', text end - def test_smartypants + it "test_smartypants" do text = filter_text('"foo"',[:smartypants]) assert_equal '&#8220;foo&#8221;', text end - def test_markdown + it "test_markdown" do text = filter_text('*foo*', [:markdown]) assert_equal '<p><em>foo</em></p>', text @@ -43,7 +43,7 @@ describe TextfilterController do assert_equal "<p>foo</p>\n\n<p>bar</p>", text end - def test_filterchain + it "test_filterchain" do assert_equal '<p><em>&#8220;foo&#8221;</em></p>', filter_text('*"foo"*',[:markdown,:smartypants]) @@ -51,7 +51,7 @@ describe TextfilterController do filter_text('*"foo"*',[:doesntexist1,:markdown,"doesn't exist 2",:smartypants,:nopenotmeeither]) end - def test_flickr + it "test_flickr" do assert_equal "<div style=\"float:left\" class=\"flickrplugin\"><a href=\"http://www.flickr.com/users/scottlaird/31366117\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_s.jpg\" width=\"75\" height=\"75\" alt=\"Matz\" title=\"Matz\"/></a><p class=\"caption\" style=\"width:75px\">This is Matz, Ruby's creator</p></div>", filter_text('<typo:flickr img="31366117" size="Square" style="float:left"/>', [:macropre,:macropost], @@ -70,7 +70,7 @@ describe TextfilterController do {'flickr-user' => 'scott@sigkill.org'}) end - def test_broken_flickr_link + it "test_broken_flickr_link" do assert_equal %{<div class='broken_flickr_link'>\`notaflickrid\' could not be displayed because: <br />Photo not found</div>}, filter_text('<typo:flickr img="notaflickrid" />', [:macropre, :macropost], @@ -117,12 +117,12 @@ end end end - def test_named_filter + it "test_named_filter" do assert_equal '<p><em>&#8220;foo&#8221;</em></p>', TextFilter.filter_text_by_name(blog, '*"foo"*', 'markdown smartypants') end - def test_code_plus_markup_chain + it "test_code_plus_markup_chain" do text = <<-EOF *header text here* @@ -165,7 +165,7 @@ EOF assert_equal expects_textile.strip, TextFilter.filter_text_by_name(blog, text, 'textile') end - def test_lightbox + it "test_lightbox" do assert_equal "<div style=\"float:left\" class=\"lightboxplugin\"><a href=\"http://photos23.flickr.com/31366117_b1a791d68e_b.jpg\" rel=\"lightbox\" title=\"Matz\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_t.jpg\" width=\"67\" height=\"100\" alt=\"Matz\" title=\"Matz\"/></a><p class=\"caption\" style=\"width:67px\">This is Matz, Ruby's creator</p></div>", filter_text('<typo:lightbox img="31366117" thumbsize="Thumbnail" displaysize="Large" style="float:left"/>', [:macropre,:macropost], spec/controllers/textfilter_controller_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe ThemeController do integrate_views - def test_stylesheets + it "test_stylesheets" do get :stylesheets, :filename => "style.css" assert_response :success assert_equal "text/css", @response.content_type @@ -11,19 +11,19 @@ describe ThemeController do assert_equal "inline; filename=\"style.css\"", @response.headers['Content-Disposition'] end - def test_images + it "test_images" do get :images, :filename => "bg_white.png" assert_response :success assert_equal "image/png", @response.content_type assert_equal "inline; filename=\"bg_white.png\"", @response.headers['Content-Disposition'] end - def test_malicious_path + it "test_malicious_path" do get :stylesheets, :filename => "../../../config/database.yml" assert_response 404 end - def test_view_theming + it "test_view_theming" do get :static_view_test assert_response :success spec/controllers/theme_controller_spec.rb @@ -57,17 +57,17 @@ describe XmlController do end end - def test_feed_rss20 + it "test_feed_rss20" do get :feed, :format => 'rss20', :type => 'feed' assert_moved_permanently_to 'http://test.host/articles.rss' end - def test_feed_rss20_comments + it "test_feed_rss20_comments" do get :feed, :format => 'rss20', :type => 'comments' assert_moved_permanently_to admin_comments_url(:format=>:rss) end - def test_feed_rss20_trackbacks + it "test_feed_rss20_trackbacks" do get :feed, :format => 'rss20', :type => 'trackbacks' assert_response :success assert_xml @response.body @@ -75,34 +75,34 @@ describe XmlController do assert_rss20 end - def test_feed_rss20_article + 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) end - def test_feed_rss20_category + it "test_feed_rss20_category" do get :feed, :format => 'rss20', :type => 'category', :id => 'personal' assert_moved_permanently_to(category_url('personal', :format => 'rss')) end - def test_feed_rss20_tag + it "test_feed_rss20_tag" do get :feed, :format => 'rss20', :type => 'tag', :id => 'foo' assert_moved_permanently_to(tag_url('foo', :format=>'rss')) end - def test_feed_atom10_feed + it "test_feed_atom10_feed" do get :feed, :format => 'atom10', :type => 'feed' assert_response :moved_permanently assert_moved_permanently_to "http://test.host/articles.atom" end - def test_feed_atom10_comments + it "test_feed_atom10_comments" do get :feed, :format => 'atom10', :type => 'comments' assert_response :moved_permanently assert_moved_permanently_to admin_comments_url(:format=>'atom') end - def test_feed_atom10_trackbacks + it "test_feed_atom10_trackbacks" do get :feed, :format => 'atom10', :type => 'trackbacks' assert_response :success assert_xml @response.body @@ -117,47 +117,47 @@ describe XmlController do assert_select 'summary' end - def test_feed_atom10_article + 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') end - def test_feed_atom10_category + it "test_feed_atom10_category" do get :feed, :format => 'atom10', :type => 'category', :id => 'personal' assert_moved_permanently_to(category_url('personal', :format => 'atom')) end - def test_feed_atom10_tag + it "test_feed_atom10_tag" do get :feed, :format => 'atom10', :type => 'tag', :id => 'foo' assert_moved_permanently_to(tag_url('foo',:format => 'atom')) end - def test_articlerss + it "test_articlerss" do get :articlerss, :id => contents(:article1).id assert_response :redirect end - def test_commentrss + it "test_commentrss" do get :commentrss, :id => 1 assert_response :redirect end - def test_trackbackrss + it "test_trackbackrss" do get :trackbackrss, :id => 1 assert_response :redirect end - def test_bad_format + it "test_bad_format" do get :feed, :format => 'atom04', :type => 'feed' assert_response :missing end - def test_bad_type + it "test_bad_type" do get :feed, :format => 'rss20', :type => 'foobar' assert_response :missing end - def test_rsd + it "test_rsd" do get :rsd, :id => 1 assert_response :success assert_nothing_raised do @@ -165,13 +165,13 @@ describe XmlController do end end - def test_atom03 + it "test_atom03" do get :feed, :format => 'atom03', :type => 'feed' assert_response :moved_permanently assert_moved_permanently_to 'http://test.host/articles.atom' end - def test_itunes + it "test_itunes" do get :itunes assert_response :success assert_xml @response.body @@ -179,7 +179,7 @@ describe XmlController do end # TODO(laird): make this more robust - def test_sitemap + it "test_sitemap" do get :feed, :format => 'googlesitemap', :type => 'sitemap' assert_response :success spec/controllers/xml_controller_spec.rb @@ -15,18 +15,18 @@ describe "CommentClosing from Test::Unit; no I don't know why it's in article_cl Blog.stub!(:default).and_return(@blog) end - def test_new_article_should_be_open_if_auto_close_is_zero + it "test_new_article_should_be_open_if_auto_close_is_zero" do art = an_article art.created_at = Time.now assert !art.comments_closed? end - def test_old_article_should_be_open_if_auto_close_is_zero + it "test_old_article_should_be_open_if_auto_close_is_zero" do art = an_article(:created_at => Time.now - 1000.days) assert !art.comments_closed? end - def test_new_article_should_be_open_if_auto_close_is_thirty + it "test_new_article_should_be_open_if_auto_close_is_thirty" do @blog.sp_article_auto_close = 30 art = an_article assert !art.comments_closed? @@ -34,7 +34,7 @@ describe "CommentClosing from Test::Unit; no I don't know why it's in article_cl assert !art.comments_closed? end - def test_old_article_should_be_closed_if_auto_close_is_thirty + it "test_old_article_should_be_closed_if_auto_close_is_thirty" do @blog.sp_article_auto_close = 30 art = an_article(:created_at => Time.now - 31.days) assert art.comments_closed? spec/models/article_closing_spec.rb @@ -30,32 +30,32 @@ describe Article do end end - def test_content_fields + it "test_content_fields" do a = Article.new assert_equal [:body, :extended], a.content_fields end - def test_permalink_url + it "test_permalink_url" do assert_equal 'http://myblog.net/2004/06/01/article-3', contents(:article3).permalink_url(anchor=nil, only_path=true) end - def test_edit_url + it "test_edit_url" do a = contents(:article3) assert_equal "http://myblog.net/admin/content/edit/#{a.id}", a.edit_url end - def test_delete_url + it "test_delete_url" do a = contents(:article3) assert_equal "http://myblog.net/admin/content/destroy/#{a.id}", a.delete_url end - def test_feed_url + it "test_feed_url" do a = contents(:article3) assert_equal "http://myblog.net/2004/06/01/article-3.atom", a.feed_url(:atom10) assert_equal "http://myblog.net/2004/06/01/article-3.rss", a.feed_url(:rss20) end - def test_create + it "test_create" do a = Article.new a.user_id = 1 a.body = "Foo" @@ -69,7 +69,7 @@ describe Article do assert_equal 1, b.categories.size end - def test_permalink_with_title + it "test_permalink_with_title" do assert_equal( contents(:article3), Article.find_by_permalink({:year => 2004, :month => 06, :day => 01, :title => "article-3"}) ) assert_raises(ActiveRecord::RecordNotFound) do @@ -77,7 +77,7 @@ describe Article do end end - def test_strip_title + it "test_strip_title" do assert_equal "article-3", "Article-3".to_url assert_equal "article-3", "Article 3!?#".to_url assert_equal "there-is-sex-in-my-violence", "There is Sex in my Violence!".to_url @@ -86,13 +86,13 @@ describe Article do assert_equal "my-cats-best-friend", "My Cat's Best Friend".to_url end - def test_perma_title + it "test_perma_title" do assert_equal "article-1", contents(:article1).stripped_title assert_equal "article-2", contents(:article2).stripped_title assert_equal "article-3", contents(:article3).stripped_title end - def test_html_title + it "test_html_title" do a = Article.new a.title = "This <i>is</i> a <b>test</b>" assert a.save @@ -100,7 +100,7 @@ describe Article do assert_equal 'this-is-a-test', a.permalink end - def test_multibyte_title + it "test_multibyte_title" do a = Article.new a.title = "ルビー" assert a.save @@ -108,20 +108,20 @@ describe Article do assert_equal '%E3%83%AB%E3%83%93%E3%83%BC', a.permalink end - def test_urls + it "test_urls" do urls = contents(:article4).html_urls assert_equal ["http://www.example.com/public"], urls end ### XXX: Should we have a test here? - def test_send_pings + it "test_send_pings" do end ### XXX: Should we have a test here? - def test_send_multiple_pings + it "test_send_multiple_pings" do end - def test_tags + it "test_tags" do a = Article.new(:title => 'Test tag article', :keywords => 'test tag tag stuff'); @@ -163,14 +163,14 @@ describe Article do assert_equal ['test', 'tagtest', 'web2-0'].sort, c.tags.collect(&:name).sort end - def test_find_published_by_tag_name + it "test_find_published_by_tag_name" do @articles = Tag.find_by_name(tags(:foo).name).published_articles assert_results_are(:article1, :article2, :publisher_article) end - def test_find_published + it "test_find_published" do @articles = Article.find_published assert_results_are(:search_target, :article1, :article2, :article3, :inactive_article,:xmltest, @@ -181,7 +181,7 @@ describe Article do assert_results_are :article1 end - def test_just_published_flag + it "test_just_published_flag" do art = Article.new(:title => 'title', :body => 'body', :published => true) @@ -198,18 +198,18 @@ describe Article do assert ! art.just_changed_published_status? end - def test_future_publishing + it "test_future_publishing" do assert_sets_trigger(Article.create!(:title => 'title', :body => 'body', :published => true, :published_at => Time.now + 4.seconds)) end - def test_future_publishing_without_published_flag + it "test_future_publishing_without_published_flag" do assert_sets_trigger Article.create!(:title => 'title', :body => 'body', :published_at => Time.now + 4.seconds) end - def test_triggers_are_dependent + it "test_triggers_are_dependent" do art = Article.create!(:title => 'title', :body => 'body', :published_at => Time.now + 1.hour) assert_equal 1, Trigger.count @@ -230,7 +230,7 @@ describe Article do assert art.published end - def test_find_published_by_category + it "test_find_published_by_category" do Article.create!(:title => "News from the future!", :body => "The future is cool!", :keywords => "future", @@ -243,13 +243,13 @@ describe Article do assert_results_are :article1 end - def test_find_published_by_nonexistent_category_raises_exception + it "test_find_published_by_nonexistent_category_raises_exception" do assert_raises ActiveRecord::RecordNotFound do Category.find_by_permalink('does-not-exist').published_articles end end - def test_destroy_file_upload_associations + it "test_destroy_file_upload_associations" do a = contents(:article1) assert_equal 2, a.resources.size a.resources << resources(:resource3) @@ -266,13 +266,13 @@ describe Article do assert_equal ['bob', 'randomuser'], a.notify_users.collect {|u| u.login }.sort end - def test_tags_on_update + it "test_tags_on_update" do contents(:article3).update_attribute :keywords, "my new tags" assert_equal 3, contents(:article3).reload.tags.size assert contents(:article3).tags.include?(Tag.find_by_name("new")) end - def test_withdrawal + it "test_withdrawal" do art = Article.find(contents(:article1).id) assert art.published? assert ! art.withdrawn? @@ -284,7 +284,7 @@ describe Article do assert art.withdrawn? end - def test_default_filter + it "test_default_filter" do a = Article.find(contents(:article1).id) assert_equal 'textile', a.default_text_filter.name end @@ -405,14 +405,14 @@ describe Article do end end - def test_can_ping_fresh_article_iff_it_allows_pings + it "test_can_ping_fresh_article_iff_it_allows_pings" do a = Article.find(contents(:article1).id) assert_equal(false, a.pings_closed?) a.allow_pings = false assert_equal(true, a.pings_closed?) end - def test_cannot_ping_old_article + it "test_cannot_ping_old_article" do a = Article.find(contents(:article3).id) assert_equal(true, a.pings_closed?) a.allow_pings = false spec/models/article_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 spec/models/blacklist_pattern_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? spec/models/content_state/feedback_states_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 spec/models/notification_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) spec/models/ping_pinger_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)) spec/models/route_cache_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 spec/models/sidebar_spec.rb 348b596680d5d7c94d3eb3e07abdaf26a0ec888d Matijs van Zuijlen matijs@matijs.net http://github.com/fdv/typo/commit/a9e94c82412d01cffcc8959e81b2ee51fd1f43fa a9e94c82412d01cffcc8959e81b2ee51fd1f43fa 2009-10-25T06:00:42-07:00 2009-10-25T06:00:42-07:00 Replace all Test::Unit style tests with RSpec style specs, since RSpec's handling of these tests proved unreliable: In particular, a test would fail when the full suite was run, but pass when only the single spec file was run. caf09c3e2e03f2e7c5e0d5b30b7510fe95d4e029 Matijs van Zuijlen matijs@matijs.net