Download as
Browse Code »

Commit 8c9632f9f184984d798e0455d41a24fb9f1e56cc

Authored by Braulio Bhavamitra
1 parent ee8510cb
Exists in staging and in 21 other branches all_pending_tasks_api, api_roles, comments_permissions, elasticsearch, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, environment-exposes-api, external_followers, federation_oauth_provider, follower_permition, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, profile_api_improvements, user_mention

test: support spec dsl and don't require concerns

Showing 4 changed files with 2 additions and 12 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @8c9632f
1 1 require 'digest/sha1'
2   -require 'user_activation_job'
3 2 require 'securerandom'
4 3  
5 4 # User models the system users, and is generated by the acts_as_authenticated
... ...
config/initializers/00_dependencies.rb
  Diff comments   View file @8c9632f
... ... @@ -25,7 +25,6 @@ require 'acts_as_customizable'
25 25 require 'route_if'
26 26 require 'maybe_add_http'
27 27 require 'set_profile_region_from_city_state'
28   -require 'authenticated_system'
29 28 require 'needs_profile'
30 29 require 'white_list_filter'
31 30  
... ...
config/initializers/active_record_extensions.rb
  Diff comments   View file @8c9632f
... ... @@ -2,8 +2,6 @@ require 'upload_sanitizer'
2 2  
3 3 module ActiveRecordExtension
4 4  
5   - extend ActiveSupport::Concern
6   -
7 5 module ClassMethods
8 6 def reflect_on_association(name)
9 7 reflection = super
... ...
test/test_helper.rb
  Diff comments   View file @8c9632f
... ... @@ -8,7 +8,7 @@ require 'rails/test_help'
8 8  
9 9 require 'mocha'
10 10 require 'mocha/mini_test'
11   -
  11 +require "minitest/spec"
12 12 require "minitest/reporters"
13 13 Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new, ENV, Minitest.backtrace_filter
14 14  
... ... @@ -52,19 +52,13 @@ class ActiveSupport::TestCase
52 52 # then set this back to true.
53 53 self.use_instantiated_fixtures = false
54 54  
55   - # Add more helper methods to be used by all tests here...
  55 + extend Test::Should
56 56  
57   - # for fixture_file_upload
58 57 include ActionDispatch::TestProcess
59   -
60 58 include Noosfero::Factory
61   -
62 59 include AuthenticatedTestHelper
63   -
64 60 include PerformanceHelper
65 61  
66   - extend Test::Should
67   -
68 62 fixtures :environments, :roles
69 63  
70 64 def self.all_fixtures
... ...