Download as
Browse Code »

Commit c586c3b5f53dbd689288b8992e857da3bdd95a80

Authored by Joenio Costa
1 parent e8f28cae
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Cosmetic changes and removing trailing whitespaces 

(ActionItem2694)
Showing 2 changed files with 6 additions and 7 deletions   Show diff stats
app/views/profile_editor/_person.rhtml
  Diff comments   View file @c586c3b
@@ -24,4 +24,3 @@ @@ -24,4 +24,3 @@
24 <div> 24 <div>
25 <%= select_tag 'profile_data[notification_time]', options_for_select([[_('Disabled'), 0], [_('Hourly'), 1], [_('Half Day'), 12], [_('Daily'), 24]], @profile.notification_time) %> 25 <%= select_tag 'profile_data[notification_time]', options_for_select([[_('Disabled'), 0], [_('Hourly'), 1], [_('Half Day'), 12], [_('Daily'), 24]], @profile.notification_time) %>
26 </div> 26 </div>
27 -  
test/unit/acts_as_having_settings_test.rb
  Diff comments   View file @c586c3b
@@ -82,7 +82,7 @@ class ActsAsHavingSettingsTest &lt; ActiveSupport::TestCase @@ -82,7 +82,7 @@ class ActsAsHavingSettingsTest &lt; ActiveSupport::TestCase
82 82
83 should 'setting_changed be true if a setting passed as parameter was changed' do 83 should 'setting_changed be true if a setting passed as parameter was changed' do
84 obj = TestClass.new 84 obj = TestClass.new
85 - obj.flag= true 85 + obj.flag = true
86 assert obj.setting_changed? 'flag' 86 assert obj.setting_changed? 'flag'
87 end 87 end
88 88
@@ -93,24 +93,24 @@ class ActsAsHavingSettingsTest &lt; ActiveSupport::TestCase @@ -93,24 +93,24 @@ class ActsAsHavingSettingsTest &lt; ActiveSupport::TestCase
93 93
94 should 'setting_changed be false if a setting passed as parameter was changed with the same value' do 94 should 'setting_changed be false if a setting passed as parameter was changed with the same value' do
95 obj = TestClass.new 95 obj = TestClass.new
96 - obj.flag= true 96 + obj.flag = true
97 obj.save 97 obj.save
98 - obj.flag= true 98 + obj.flag = true
99 assert !obj.setting_changed?('flag') 99 assert !obj.setting_changed?('flag')
100 end 100 end
101 101
102 should 'setting_changed be false if a setting passed as parameter was not changed but another setting is changed' do 102 should 'setting_changed be false if a setting passed as parameter was not changed but another setting is changed' do
103 obj = TestClass.new(:name => 'some name') 103 obj = TestClass.new(:name => 'some name')
104 obj.save 104 obj.save
105 - obj.name= 'antoher nme' 105 + obj.name = 'antoher nme'
106 assert !obj.setting_changed?('flag') 106 assert !obj.setting_changed?('flag')
107 end 107 end
108 108
109 should 'setting_changed be true for all changed fields' do 109 should 'setting_changed be true for all changed fields' do
110 obj = TestClass.new(:name => 'some name', :flag => false) 110 obj = TestClass.new(:name => 'some name', :flag => false)
111 obj.save 111 obj.save
112 - obj.name= 'another nme'  
113 - obj.flag= true 112 + obj.name = 'another nme'
  113 + obj.flag = true
114 assert obj.setting_changed?('flag') 114 assert obj.setting_changed?('flag')
115 assert obj.setting_changed?('name') 115 assert obj.setting_changed?('name')
116 end 116 end