Download as
Browse Code »

Commit b4e6aa3b536e00d995288f900c0e98cc596c66ba

Authored by Braulio Bhavamitra
1 parent c9fefc28
Exists in staging and in 39 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, 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_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, user_mention, webfinger_server

rails4: assert_block was deprecated

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
test/test_helper.rb
  Diff comments   View file @b4e6aa3
@@ -90,7 +90,7 @@ class ActiveSupport::TestCase @@ -90,7 +90,7 @@ class ActiveSupport::TestCase
90 super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters), headers) 90 super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters), headers)
91 end 91 end
92 92
93 - alias :ok :assert_block 93 + alias_method :ok, :assert
94 94
95 def assert_equivalent(enum1, enum2) 95 def assert_equivalent(enum1, enum2)
96 assert( ((enum1 - enum2) == []) && ((enum2 - enum1) == []), "<#{enum1.inspect}> expected to be equivalent to <#{enum2.inspect}>") 96 assert( ((enum1 - enum2) == []) && ((enum2 - enum1) == []), "<#{enum1.inspect}> expected to be equivalent to <#{enum2.inspect}>")