Download as
Browse Code »

Commit e2a6a002baa33e61ef9c673e27dd0719fc97e960

Authored by Joao M. M. da Silva + Alessandro Palmeira
Committed by Paulo Meireles
1 parent 59c59bd5
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[Mezuro] fixes in reading and reading group.

Showing 3 changed files with 23 additions and 2 deletions   Show diff stats
plugins/mezuro/lib/kalibro/reading.rb
  Diff comments   View file @e2a6a00
... ... @@ -14,4 +14,22 @@ class Kalibro::Reading < Kalibro::Model
14 14 new request(:reading_of, {:range_id => range_id} )[:reading]
15 15 end
16 16  
  17 + def id=(value)
  18 + @id = value.to_i
  19 + end
  20 +
  21 + def grade=(value)
  22 + @grade = value.to_f
  23 + end
  24 +
  25 + def save(reading_group_id)
  26 + begin
  27 + self.id = self.class.request(:save_reading, {:reading => self.to_hash, :group_id => reading_group_id})[:reading_id]
  28 + true
  29 + rescue Exception => exception
  30 + add_error exception
  31 + false
  32 + end
  33 + end
  34 +
17 35 end
... ...
plugins/mezuro/test/unit/kalibro/reading_group_test.rb
  Diff comments   View file @e2a6a00
... ... @@ -11,6 +11,7 @@ class ReadingGroupTest < ActiveSupport::TestCase
11 11  
12 12 should 'create reading group from hash' do
13 13 assert_equal @hash[:name], Kalibro::ReadingGroup.new(@hash).name
  14 + assert_equal @hash[:id].to_i, Kalibro::ReadingGroup.new(@hash).id
14 15 end
15 16  
16 17 should 'convert reading group to hash' do
... ... @@ -20,9 +21,9 @@ class ReadingGroupTest < ActiveSupport::TestCase
20 21 should 'verify existence of reading group' do
21 22 fake_id = 0
22 23 Kalibro::ReadingGroup.expects(:request).with(:reading_group_exists, {:group_id => fake_id}).returns({:exists => false})
23   - Kalibro::ReadingGroup.expects(:request).with(:reading_group_exists, {:group_id => @hash[:id]}).returns({:exists => true})
  24 + Kalibro::ReadingGroup.expects(:request).with(:reading_group_exists, {:group_id => @hash[:id].to_i}).returns({:exists => true})
24 25 assert !Kalibro::ReadingGroup.exists?(fake_id)
25   - assert Kalibro::ReadingGroup.exists?(@hash[:id])
  26 + assert Kalibro::ReadingGroup.exists?(@hash[:id].to_i)
26 27 end
27 28  
28 29 should 'get reading group' do
... ...
plugins/mezuro/test/unit/kalibro/reading_test.rb
  Diff comments   View file @e2a6a00
... ... @@ -11,6 +11,8 @@ class ReadingTest < ActiveSupport::TestCase
11 11  
12 12 should 'create reading from hash' do
13 13 assert_equal @hash[:label], Kalibro::Reading.new(@hash).label
  14 + assert_equal @hash[:id].to_i, Kalibro::Reading.new(@hash).id
  15 + assert_equal @hash[:grade].to_f, Kalibro::Reading.new(@hash).grade
14 16 end
15 17  
16 18 should 'convert reading to hash' do
... ...