Download as
Browse Code »

Commit cff1444052b81d7281a6e6a4254d05510e5a7201

Authored by Braulio Bhavamitra
2 parents 088c792e 54127654
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Merge branch 'removing-unusefull-code' into noosfero

Showing 2 changed files with 1 additions and 13 deletions   Show diff stats
test/test_helper.rb
  Diff comments   View file @cff1444
... ... @@ -88,14 +88,6 @@ class ActiveSupport::TestCase
88 88 assert( ((enum1 - enum2) == []) && ((enum2 - enum1) == []), "<#{enum1.inspect}> expected to be equivalent to <#{enum2.inspect}>")
89 89 end
90 90  
91   - def assert_includes(array, element)
92   - assert(array.include?(element), "<#{array.inspect}> expected to include <#{element.inspect}>")
93   - end
94   -
95   - def assert_not_includes(array, element)
96   - assert(!array.include?(element), "<#{array.inspect}> expected to NOT include <#{element.inspect}>")
97   - end
98   -
99 91 def assert_mandatory(object, attribute, test_value = 'some random string')
100 92 object.send("#{attribute}=", nil)
101 93 object.valid?
... ... @@ -111,10 +103,6 @@ class ActiveSupport::TestCase
111 103 assert !object.errors[attribute.to_s].present?
112 104 end
113 105  
114   - def assert_subclass(parent, child)
115   - assert_equal parent, child.superclass, "Class #{child} expected to be a subclass of #{parent}"
116   - end
117   -
118 106 # this check only if text has html tag
119 107 def assert_sanitized(text)
120 108 assert !text.index('<'), "Text '#{text}' expected to be sanitized"
... ...
test/unit/tiny_mce_article_test.rb
  Diff comments   View file @cff1444
... ... @@ -11,7 +11,7 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
11 11  
12 12 # this test can be removed when we get real tests for TinyMceArticle
13 13 should 'be an article' do
14   - assert_subclass TextArticle, TinyMceArticle
  14 + assert_kind_of TextArticle, TinyMceArticle.new
15 15 end
16 16  
17 17 should 'define description' do
... ...