[Git][noosfero/noosfero][master] test: support spec dsl and don't require concerns

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
8c9632f9 by Braulio Bhavamitra at 2016-06-09T17:22:32-03:00
test: support spec dsl and don't require concerns

- - - - -


4 changed files:

- app/models/user.rb
- config/initializers/00_dependencies.rb
- config/initializers/active_record_extensions.rb
- test/test_helper.rb


Changes:

=====================================
app/models/user.rb
=====================================
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,4 @@
 require 'digest/sha1'
-require 'user_activation_job'
 require 'securerandom'
 
 # User models the system users, and is generated by the acts_as_authenticated


=====================================
config/initializers/00_dependencies.rb
=====================================
--- a/config/initializers/00_dependencies.rb
+++ b/config/initializers/00_dependencies.rb
@@ -25,7 +25,6 @@ require 'acts_as_customizable'
 require 'route_if'
 require 'maybe_add_http'
 require 'set_profile_region_from_city_state'
-require 'authenticated_system'
 require 'needs_profile'
 require 'white_list_filter'
 


=====================================
config/initializers/active_record_extensions.rb
=====================================
--- a/config/initializers/active_record_extensions.rb
+++ b/config/initializers/active_record_extensions.rb
@@ -2,8 +2,6 @@ require 'upload_sanitizer'
 
 module ActiveRecordExtension
 
-  extend ActiveSupport::Concern
-
   module ClassMethods
     def reflect_on_association(name)
       reflection = super


=====================================
test/test_helper.rb
=====================================
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -8,7 +8,7 @@ require 'rails/test_help'
 
 require 'mocha'
 require 'mocha/mini_test'
-
+require "minitest/spec"
 require "minitest/reporters"
 Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new, ENV, Minitest.backtrace_filter
 
@@ -52,19 +52,13 @@ class ActiveSupport::TestCase
   # then set this back to true.
   self.use_instantiated_fixtures  = false
 
-  # Add more helper methods to be used by all tests here...
+  extend Test::Should
 
-  # for fixture_file_upload
   include ActionDispatch::TestProcess
-
   include Noosfero::Factory
-
   include AuthenticatedTestHelper
-
   include PerformanceHelper
 
-  extend Test::Should
-
   fixtures :environments, :roles
 
   def self.all_fixtures



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/8c9632f9f184984d798e0455d41a24fb9f1e56cc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160609/c10843c1/attachment-0001.html>