Download as
Browse Code »

Commit 8c9632f9f184984d798e0455d41a24fb9f1e56cc

Authored by Braulio Bhavamitra
1 parent ee8510cb
Exists in profile_api_improvements and in 1 other branch fix_sign_up_form

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 require 'digest/sha1' 1 require 'digest/sha1'
2 -require 'user_activation_job'  
3 require 'securerandom' 2 require 'securerandom'
4 3
5 # User models the system users, and is generated by the acts_as_authenticated 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,7 +25,6 @@ require 'acts_as_customizable'
25 require 'route_if' 25 require 'route_if'
26 require 'maybe_add_http' 26 require 'maybe_add_http'
27 require 'set_profile_region_from_city_state' 27 require 'set_profile_region_from_city_state'
28 -require 'authenticated_system'  
29 require 'needs_profile' 28 require 'needs_profile'
30 require 'white_list_filter' 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,8 +2,6 @@ require 'upload_sanitizer'
2 2
3 module ActiveRecordExtension 3 module ActiveRecordExtension
4 4
5 - extend ActiveSupport::Concern  
6 -  
7 module ClassMethods 5 module ClassMethods
8 def reflect_on_association(name) 6 def reflect_on_association(name)
9 reflection = super 7 reflection = super
test/test_helper.rb
  Diff comments   View file @8c9632f
@@ -8,7 +8,7 @@ require 'rails/test_help' @@ -8,7 +8,7 @@ require 'rails/test_help'
8 8
9 require 'mocha' 9 require 'mocha'
10 require 'mocha/mini_test' 10 require 'mocha/mini_test'
11 - 11 +require "minitest/spec"
12 require "minitest/reporters" 12 require "minitest/reporters"
13 Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new, ENV, Minitest.backtrace_filter 13 Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new, ENV, Minitest.backtrace_filter
14 14
@@ -52,19 +52,13 @@ class ActiveSupport::TestCase @@ -52,19 +52,13 @@ class ActiveSupport::TestCase
52 # then set this back to true. 52 # then set this back to true.
53 self.use_instantiated_fixtures = false 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 include ActionDispatch::TestProcess 57 include ActionDispatch::TestProcess
59 -  
60 include Noosfero::Factory 58 include Noosfero::Factory
61 -  
62 include AuthenticatedTestHelper 59 include AuthenticatedTestHelper
63 -  
64 include PerformanceHelper 60 include PerformanceHelper
65 61
66 - extend Test::Should  
67 -  
68 fixtures :environments, :roles 62 fixtures :environments, :roles
69 63
70 def self.all_fixtures 64 def self.all_fixtures