Merge branch 'master' of gitlab.com:noosfero/noosfero

Joenio Costa
2 parents 692651c0 d35bce8d
Showing 7 changed files with 49 additions and 25 deletions Show diff stats
app/helpers/boxes_helper.rb
test/functional/mailconf_controller_test.rb
test/functional/profile_controller_test.rb
test/functional/users_controller_test.rb
test/integration/forgot_password_test.rb
test/unit/profile_test.rb
test/unit/user_test.rb
@@ -227,7 +227,7 @@ module BoxesHelper
   # DEPRECATED. Do not use this.
   def import_blocks_stylesheets(options = {})
-    @blocks_css_files ||= current_blocks.map{|b|'blocks/' + block.class.name.to_css_class}.uniq
+    @blocks_css_files ||= current_blocks.map{|block|'blocks/' + block.class.name.to_css_class}.uniq
     stylesheet_import(@blocks_css_files, options)
   end
   def block_css_classes(block)
@@ -2,16 +2,17 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class MailconfControllerTest < ActionController::TestCase
-  all_fixtures
-
   def setup
     @controller = MailconfController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    User.destroy_all
+    @user = create_user('ze')
     MailConf.stubs(:enabled?).returns(true)
     MailConf.stubs(:webmail_url).returns('http://web.mail.net/')
   end
+  attr_accessor :user
   should 'check if mail is enabled' do
     MailConf.expects(:enabled?).returns(false)
@@ -29,7 +30,8 @@ class MailconfControllerTest &lt; ActionController::TestCase
   end
   should 'not be edited by others' do
-    login_as('johndoe')
+    another = create_user('johndoe')
+    login_as(another.login)
     get :index, :profile => 'ze'
     assert_response 403
   end
@@ -43,7 +45,7 @@ class MailconfControllerTest &lt; ActionController::TestCase
   should 'expose user to templates' do
     login_as('ze')
     get :index, :profile => 'ze'
-    assert_equal users(:ze), assigns(:user)
+    assert_equal user, assigns(:user)
   end
   should 'present enable/disable for e-mail use'  do
@@ -58,7 +60,7 @@ class MailconfControllerTest &lt; ActionController::TestCase
   should 'display correctly the state false of e-mail enable/disable' do
     login_as('ze')
-    users(:ze).update_attributes!(:enable_email => false)
+    user.update_attributes!(:enable_email => false)
     get :index, :profile => 'ze'
     assert_tag :tag => 'a', :content => 'Enable e-Mail'
     assert_no_tag :tag => 'a', :content => 'Disable e-Mail', :attributes => { :href => '/myprofile/ze/mailconf/disable' }
@@ -91,7 +93,7 @@ class MailconfControllerTest &lt; ActionController::TestCase
   should 'save mail enable/disable as false' do
     login_as('ze')
-    assert users(:ze).enable_email!
+    assert user.enable_email!
     post :disable, :profile => 'ze'
     assert !Profile['ze'].user.enable_email
   end
@@ -122,8 +124,8 @@ class MailconfControllerTest &lt; ActionController::TestCase
   should 'not display input for enable/disable e-mail when has pending_enable_email' do
     login_as('ze')
-    users(:ze).update_attribute(:environment_id, Environment.default.id)
-    EmailActivation.create!(:requestor => users(:ze).person, :target => Environment.default)
+    user.update_attribute(:environment_id, Environment.default.id)
+    EmailActivation.create!(:requestor => user.person, :target => Environment.default)
     get :index, :profile => 'ze'
     assert_no_tag :tag => 'input', :attributes => {:name => 'user[enable_email]', :type => 'checkbox'}
   end
@@ -1383,17 +1383,21 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_equal "Comment successfully added.", assigns(:message)
   end
-  should 'display comment in wall if user was removed' do
+  should 'display comment in wall if user was removed after click in view all comments' do
     UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
     article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
     to_be_removed = create_user('removed_user').person
     comment = Comment.create!(:author => to_be_removed, :title => 'Test Comment', :body => 'My author does not exist =(', :source_id => article.id, :source_type => 'Article')
     to_be_removed.destroy
+    activity = ActionTracker::Record.last
+
     login_as(profile.identifier)
-    get :index, :profile => profile.identifier
+    get :more_comments, :profile => profile.identifier, :activity => activity.id, :comment_page => 1, :tab_action => 'wall'
-    assert_tag :tag => 'span', :content => '(removed user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-removed'}
+    assert_select_rjs :insert_html do
+      assert_select 'span', :content => '(removed user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-removed'}
+    end
   end
   should 'not display spam comments in wall' do
@@ -1407,7 +1411,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert !/This article makes me hungry/.match(@response.body), 'Spam comment was shown!'
   end
-  should 'display comment in wall from non logged users' do
+  should 'display comment in wall from non logged users after click in view all comments' do
     UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
     article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
     comment = Comment.create!(:name => 'outside user', :email => 'outside@localhost.localdomain', :title => 'Test Comment', :body => 'My author does not exist =(', :source_id => article.id, :source_type => 'Article')
@@ -1415,7 +1419,14 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(profile.identifier)
     get :index, :profile => profile.identifier
-    assert_tag :tag => 'span', :content => '(unauthenticated user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-unknown'}
+    activity = ActionTracker::Record.last
+
+    login_as(profile.identifier)
+    get :more_comments, :profile => profile.identifier, :activity => activity.id, :comment_page => 1, :tab_action => 'wall'
+
+    assert_select_rjs :insert_html do
+      assert_select 'span', :content => '(unauthenticated user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-unknown'}
+    end
   end
   should 'add locale on mailing' do
@@ -11,10 +11,16 @@ class UsersControllerTest &lt; ActionController::TestCase
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    admin_user = create_user_with_permission('adminuser', 'manage_environment_users', Environment.default)
+    Environment.destroy_all
+    @environment = fast_create(Environment, :is_default => true)
+ 
+
+    admin_user = create_user_with_permission('adminuser', 'manage_environment_users', environment)
     login_as('adminuser')
   end
+  attr_accessor :environment
+
   should 'not access without right permission' do
     create_user('guest')
     login_as 'guest'
@@ -63,6 +69,7 @@ class UsersControllerTest &lt; ActionController::TestCase
   should 'set admin role' do
     person = create_user.person
+    Role.create!(:name => 'Admin', :key => 'environment_administrator', :environment_id => environment.id, :permissions => ['view_environment_admin_panel'])
     assert_equal false, person.is_admin?
     post :set_admin_role, :id => person.id, :q => ''
     person.reload
@@ -70,8 +77,9 @@ class UsersControllerTest &lt; ActionController::TestCase
   end
   should 'reset admin role' do
-    environment = Environment.default
     person = create_user.person
+    Role.create!(:name => 'Admin', :key => 'environment_administrator', :environment_id => environment.id, :permissions => ['view_environment_admin_panel'])
+
     environment.add_admin(person)
     assert person.is_admin?
@@ -19,7 +19,7 @@ class ForgotPasswordTest &lt; ActionController::IntegrationTest
     assert_response :success
     assert_tag :tag => 'form', :attributes => { :action => '/account/forgot_password', :method => 'post' }
-    post '/account/forgot_password', :change_password => { :field => 'login', :value => 'forgotten', :environment_id => Environment.default.id }
+    post '/account/forgot_password', :field => 'login', :value => 'forgotten', :environment_id => Environment.default.id
     assert_response :success
     assert_template 'password_recovery_sent'
@@ -52,7 +52,7 @@ class ForgotPasswordTest &lt; ActionController::IntegrationTest
     assert_response :success
     assert_tag :tag => 'form', :attributes => { :action => '/account/forgot_password', :method => 'post' }
-    post '/account/forgot_password', :change_password => { :field => 'email', :value => 'forgotten@localhost.localdomain', :environment_id => Environment.default.id }
+    post '/account/forgot_password', :field => 'email', :value => 'forgotten@localhost.localdomain', :environment_id => Environment.default.id
     assert_response :success
     assert_template 'password_recovery_sent'
@@ -1300,7 +1300,6 @@ class ProfileTest &lt; ActiveSupport::TestCase
   should 'list folder articles' do
     profile = fast_create(Profile)
-    Article.destroy_all
     p1 = Folder.create!(:name => 'parent1', :profile => profile)
     p2 = Blog.create!(:name => 'parent2', :profile => profile)
@@ -1761,7 +1760,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
     env = fast_create(Environment)
     roles = %w(foo bar profile_foo profile_bar).map{ |r| Role.create!(:name => r, :environment_id => env.id, :permissions => ["some"]) }
     Role.create! :name => 'test', :environment_id => env.id + 1
-    assert_equal roles, Profile::Roles.all_roles(env.id)
+    assert_equivalent roles, Profile::Roles.all_roles(env.id)
   end
   should 'define method for role' do
@@ -337,10 +337,8 @@ class UserTest &lt; ActiveSupport::TestCase
     Person.any_instance.stubs(:created_at).returns(DateTime.parse('16-08-2010'))
     expected_hash = {
       'login' => 'x_and_y', 'is_admin' => true, 'since_month' => 8,
-      'chat_enabled' => false, 'since_year' => 2010, 'avatar' =>
-      'http://www.gravatar.com/avatar/a0517761d5125820c28d87860bc7c02e?only_path=false&d=&size=20',
-        'email_domain' => nil, 'amount_of_friends' => 0,
-      'friends_list' => {}, 'enterprises' => [],
+      'chat_enabled' => false, 'since_year' => 2010, 'email_domain' => nil, 
+      'amount_of_friends' => 0, 'friends_list' => {}, 'enterprises' => [],
     }
     assert_equal expected_hash['login'], person.user.data_hash['login']
@@ -348,7 +346,13 @@ class UserTest &lt; ActiveSupport::TestCase
     assert_equal expected_hash['since_month'], person.user.data_hash['since_month']
     assert_equal expected_hash['chat_enabled'], person.user.data_hash['chat_enabled']
     assert_equal expected_hash['since_year'], person.user.data_hash['since_year']
-    assert_equal expected_hash['avatar'], person.user.data_hash['avatar']
+
+    # Avatar stuff
+    assert_match 'http://www.gravatar.com/avatar/a0517761d5125820c28d87860bc7c02e', person.user.data_hash['avatar']
+    assert_match 'only_path=false', person.user.data_hash['avatar']
+    assert_match 'd=', person.user.data_hash['avatar']
+    assert_match 'size=20', person.user.data_hash['avatar']
+
     assert_equal expected_hash['email_domain'], person.user.data_hash['email_domain']
     assert_equal expected_hash['amount_of_friends'], person.user.data_hash['amount_of_friends']
     assert_equal expected_hash['friends_list'], person.user.data_hash['friends_list']
	@@ -227,7 +227,7 @@ module BoxesHelper		@@ -227,7 +227,7 @@ module BoxesHelper
227		227
228	# DEPRECATED. Do not use this.	228	# DEPRECATED. Do not use this.
229	def import_blocks_stylesheets(options = {})	229	def import_blocks_stylesheets(options = {})
230	- @blocks_css_files \|\|= current_blocks.map{\|b\|'blocks/' + block.class.name.to_css_class}.uniq	230	+ @blocks_css_files \|\|= current_blocks.map{\|block\|'blocks/' + block.class.name.to_css_class}.uniq
231	stylesheet_import(@blocks_css_files, options)	231	stylesheet_import(@blocks_css_files, options)
232	end	232	end
233	def block_css_classes(block)	233	def block_css_classes(block)
	@@ -19,7 +19,7 @@ class ForgotPasswordTest < ActionController::IntegrationTest		@@ -19,7 +19,7 @@ class ForgotPasswordTest < ActionController::IntegrationTest
19	assert_response :success	19	assert_response :success
20	assert_tag :tag => 'form', :attributes => { :action => '/account/forgot_password', :method => 'post' }	20	assert_tag :tag => 'form', :attributes => { :action => '/account/forgot_password', :method => 'post' }
21		21
22	- post '/account/forgot_password', :change_password => { :field => 'login', :value => 'forgotten', :environment_id => Environment.default.id }	22	+ post '/account/forgot_password', :field => 'login', :value => 'forgotten', :environment_id => Environment.default.id
23		23
24	assert_response :success	24	assert_response :success
25	assert_template 'password_recovery_sent'	25	assert_template 'password_recovery_sent'
	@@ -52,7 +52,7 @@ class ForgotPasswordTest < ActionController::IntegrationTest		@@ -52,7 +52,7 @@ class ForgotPasswordTest < ActionController::IntegrationTest
52	assert_response :success	52	assert_response :success
53	assert_tag :tag => 'form', :attributes => { :action => '/account/forgot_password', :method => 'post' }	53	assert_tag :tag => 'form', :attributes => { :action => '/account/forgot_password', :method => 'post' }
54		54
55	- post '/account/forgot_password', :change_password => { :field => 'email', :value => 'forgotten@localhost.localdomain', :environment_id => Environment.default.id }	55	+ post '/account/forgot_password', :field => 'email', :value => 'forgotten@localhost.localdomain', :environment_id => Environment.default.id
56		56
57	assert_response :success	57	assert_response :success
58	assert_template 'password_recovery_sent'	58	assert_template 'password_recovery_sent'