[Git][noosfero/noosfero][master] 2 commits: Fix sub_organization tests

[Antonio Terceiro]

Antonio Terceiro pushed to branch master at Noosfero / noosfero


Commits:
fe935ab1 by Eduardo Vital at 2016-01-19T19:43:37-02:00
Fix sub_organization tests

Signed-off-by: Eduardo Vital <vitaldu at gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra at gmail.com>

- - - - -
cd3edc92 by Antonio Terceiro at 2016-01-20T11:14:06+00:00
Merge branch 'plugins_to_rails4' into 'master'

Plugins to rails4

Migrate sub_organization and recent_content plugins to rails 4.

See merge request !765
- - - - -


8 changed files:

- plugins/sub_organizations/test/functional/sub_organizations_plugin_myprofile_controller_test.rb
- plugins/sub_organizations/test/functional/sub_organizations_plugin_profile_controller_test.rb
- plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_relation_test.rb → plugins/sub_organizations/test/unit/approve_paternity_relation_test.rb
- plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_test.rb → plugins/sub_organizations/test/unit/approve_paternity_test.rb
- plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/create_enterprise_test.rb → plugins/sub_organizations/test/unit/create_enterprise_test.rb
- plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/organization.rb → plugins/sub_organizations/test/unit/organization_test.rb
- plugins/sub_organizations/test/unit/sub_organizations_plugin/relation_test.rb → plugins/sub_organizations/test/unit/relation_test.rb
- plugins/sub_organizations/test/unit/sub_organizations_plugin_test.rb


Changes:

=====================================
plugins/sub_organizations/test/functional/sub_organizations_plugin_myprofile_controller_test.rb
=====================================
--- a/plugins/sub_organizations/test/functional/sub_organizations_plugin_myprofile_controller_test.rb
+++ b/plugins/sub_organizations/test/functional/sub_organizations_plugin_myprofile_controller_test.rb
@@ -1,6 +1,9 @@
 require 'test_helper'
 require_relative '../../controllers/sub_organizations_plugin_myprofile_controller'
 
+# Re-raise errors caught by the controller.
+class SubOrganizationsPluginMyprofileController; def rescue_action(e) raise e end; end
+
 class SubOrganizationsPluginMyprofileControllerTest < ActionController::TestCase
   def setup
     @controller = SubOrganizationsPluginMyprofileController.new


=====================================
plugins/sub_organizations/test/functional/sub_organizations_plugin_profile_controller_test.rb
=====================================
--- a/plugins/sub_organizations/test/functional/sub_organizations_plugin_profile_controller_test.rb
+++ b/plugins/sub_organizations/test/functional/sub_organizations_plugin_profile_controller_test.rb
@@ -1,6 +1,9 @@
 require 'test_helper'
 require_relative '../../controllers/sub_organizations_plugin_profile_controller'
 
+# Re-raise errors caught by the controller.
+class SubOrganizationsPluginProfileController; def rescue_action(e) raise e end; end
+
 class SubOrganizationsPluginProfileControllerTest < ActionController::TestCase
 
   def setup


=====================================
plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_relation_test.rb → plugins/sub_organizations/test/unit/approve_paternity_relation_test.rb
=====================================
--- a/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_relation_test.rb
+++ b/plugins/sub_organizations/test/unit/approve_paternity_relation_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SubOrganizationsPlugin::ApprovePaternityRelationTest < ActiveSupport::TestCase
+class ApprovePaternityRelationTest < ActiveSupport::TestCase
 
   def setup
     @requestor = create_user('some-user').person


=====================================
plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_test.rb → plugins/sub_organizations/test/unit/approve_paternity_test.rb
=====================================
--- a/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_test.rb
+++ b/plugins/sub_organizations/test/unit/approve_paternity_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SubOrganizationsPlugin::ApprovePaternityTest < ActiveSupport::TestCase
+class ApprovePaternityTest < ActiveSupport::TestCase
 
   def setup
     @requestor = create_user('some-user').person


=====================================
plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/create_enterprise_test.rb → plugins/sub_organizations/test/unit/create_enterprise_test.rb
=====================================
--- a/plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/create_enterprise_test.rb
+++ b/plugins/sub_organizations/test/unit/create_enterprise_test.rb
@@ -8,4 +8,3 @@ class CreateEnterpriseTest < ActiveSupport::TestCase
   end
 
 end
-


=====================================
plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/organization.rb → plugins/sub_organizations/test/unit/organization_test.rb
=====================================
--- a/plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/organization.rb
+++ b/plugins/sub_organizations/test/unit/organization_test.rb


=====================================
plugins/sub_organizations/test/unit/sub_organizations_plugin/relation_test.rb → plugins/sub_organizations/test/unit/relation_test.rb
=====================================
--- a/plugins/sub_organizations/test/unit/sub_organizations_plugin/relation_test.rb
+++ b/plugins/sub_organizations/test/unit/relation_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SubOrganizationsPlugin::RelationTest < ActiveSupport::TestCase
+class RelationTest < ActiveSupport::TestCase
 
   should 'validates presence of child and parent' do
     org = fast_create(Organization)


=====================================
plugins/sub_organizations/test/unit/sub_organizations_plugin_test.rb
=====================================
--- a/plugins/sub_organizations/test/unit/sub_organizations_plugin_test.rb
+++ b/plugins/sub_organizations/test/unit/sub_organizations_plugin_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SubOrganizationsTest < ActiveSupport::TestCase
+class SubOrganizationsPluginTest < ActiveSupport::TestCase
 
   def setup
     @plugin = SubOrganizationsPlugin.new
@@ -29,7 +29,7 @@ class SubOrganizationsTest < ActiveSupport::TestCase
 
     org1_members = plugin.organization_members(org1)
 
-    assert_equal ActiveRecord::Relation, org1_members.class
+    assert_equal Person::ActiveRecord_Relation, org1_members.class
     assert_not_includes org1_members, member1
     assert_includes org1_members, member2
     assert_includes org1_members, member3
@@ -59,7 +59,7 @@ class SubOrganizationsTest < ActiveSupport::TestCase
     person1_memberships = plugin.person_memberships(person1)
     person2_memberships = plugin.person_memberships(person2)
 
-    assert_equal ActiveRecord::Relation, person1_memberships.class
+    assert_equal Organization::ActiveRecord_Relation, person1_memberships.class
     assert_includes person1_memberships, org1
     assert_not_includes person1_memberships, org2
     assert_not_includes person1_memberships, org3
@@ -109,4 +109,3 @@ class SubOrganizationsTest < ActiveSupport::TestCase
     assert_nil plugin.control_panel_buttons
   end
 end
-



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/159e46def18af377d93bbf05348342b8bccdc1e5...cd3edc920b84d558267fa128f1c53f762ac12ff1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160120/4beb052f/attachment-0001.html>