From 29966d34ce6d1448ca9ccc42983ebf122af08551 Mon Sep 17 00:00:00 2001
From: Rodrigo <rodrigo.mss01@gmail.com>
Date: Mon, 15 Sep 2014 14:55:39 -0300
Subject: [PATCH] Fix unit tests mpog_software_plugin_test and mpog_validation_test

---
 lib/mpog_software_plugin.rb            |  5 +++--
 test/unit/mpog_software_plugin_test.rb | 32 ++++----------------------------
 test/unit/mpog_validation_test.rb      |  9 +++++----
 test/unit/plugin_test_helper.rb        | 12 ++++++++++++
 4 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/lib/mpog_software_plugin.rb b/lib/mpog_software_plugin.rb
index 8cddf43..bad9496 100644
--- a/lib/mpog_software_plugin.rb
+++ b/lib/mpog_software_plugin.rb
@@ -254,8 +254,6 @@ class MpogSoftwarePlugin < Noosfero::Plugin
     end
   end
 
-  protected
-
   def calc_percentage_registration person
     required_list = profile_required_list
     empty_fields = profile_required_empty_list person
@@ -266,6 +264,9 @@ class MpogSoftwarePlugin < Noosfero::Plugin
     percentege
   end
 
+  protected
+
+
  def create_url_to_edit_profile person
     new_url = person.public_profile_url
     new_url[:controller] = 'profile_editor'
diff --git a/test/unit/mpog_software_plugin_test.rb b/test/unit/mpog_software_plugin_test.rb
index 73aac42..395a6a4 100644
--- a/test/unit/mpog_software_plugin_test.rb
+++ b/test/unit/mpog_software_plugin_test.rb
@@ -1,10 +1,12 @@
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/plugin_test_helper'
 
 class MpogSoftwarePluginTest < ActiveSupport::TestCase
+  include PluginTestHelper
 
   def setup
     @plugin = MpogSoftwarePlugin.new
-    @user = create_user
+    @user = create_user 'login', 'test@email.com', '1234', '1234', 'test2@email.com'
     @person = @user.person
   end
 
@@ -25,36 +27,10 @@ class MpogSoftwarePluginTest < ActiveSupport::TestCase
     required_list = ["cell_phone","contact_phone","institution","comercial_phone","country","city","state","organization_website","area_interest","image"]
 
     empty_fields = required_list.count - 1
-    test_percentege = (empty_fields * 100) / required_list.count
+    test_percentege = 100 - ((empty_fields * 100) / required_list.count)
 
     plugin_percentege = @plugin.calc_percentage_registration(@person)
 
     assert_equal(test_percentege, plugin_percentege)
 	end
-
-  should 'return message with percentege of incomplete registration' do
-    @user.person.name = "Person Name"
-    @user.person.cell_phone = "76888919"
-    
-    plugin_percentege = @plugin.calc_percentage_registration(@user.person)
-
-    expected_result = "Registration " + plugin_percentege.to_s + "% incomplete ";
-    plugin_result = @plugin.incomplete_registration({:user => @user})
-
-    assert_equal(expected_result, plugin_result)
-  end
-
-  private
-
-  def create_user
-    user = User.new
-    user.login = "login"
-    user.email = "user@email.com"
-    user.password = "123456"
-    user.password_confirmation = "123456"
-    user.secondary_email = "user@secondary_email.com"
-    user.save
-    user.person.save
-    user
-  end
 end
diff --git a/test/unit/mpog_validation_test.rb b/test/unit/mpog_validation_test.rb
index 252b3ee..bb2fb01 100644
--- a/test/unit/mpog_validation_test.rb
+++ b/test/unit/mpog_validation_test.rb
@@ -1,12 +1,13 @@
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/plugin_test_helper'
 
 class MpogSoftwarePluginValidationTest < ActiveSupport::TestCase
+  include PluginTestHelper
+
   def setup
     @plugin = MpogSoftwarePlugin.new
-    institution = Institution::new(:name => "Test institution")
-    institution.save
-    @user = fast_create(User)
-    @user.institution = institution
+    @user = create_user 'login', 'test@email.com', '1234', '1234', 'test2@email.com'
+
   end
 
   def teardown
diff --git a/test/unit/plugin_test_helper.rb b/test/unit/plugin_test_helper.rb
index a752279..6835f23 100644
--- a/test/unit/plugin_test_helper.rb
+++ b/test/unit/plugin_test_helper.rb
@@ -35,4 +35,16 @@ module PluginTestHelper
     community
   end
 
+  def create_user login, email, password, password_confirmation, secondary_email
+    user = User.new
+    user.login = login
+    user.email = email
+    user.password = password
+    user.password_confirmation = password_confirmation
+    user.secondary_email = secondary_email
+    user.save
+    user.person.save
+    user
+  end
+
 end
--
libgit2 0.21.2