engines/adva_cms/test/functional/admin/articles_controller_test.rb.orig engines/adva_cms/test/functional/admin/sections_controller_test.rb.orig engines/adva_cms/test/test_helper.rb.orig engines/adva_rbac/test/integration/user_rbac_test.rb engines/adva_rbac/test/unit/helpers/roles_helper_test.rb @@ -90,6 +90,7 @@ class Test::Unit::TestCase before do stub(@controller).require_authentication stub(@controller).guard_permission + stub(@controller).has_permission? { true } end end engines/adva_cms/test/contexts.rb @@ -5,6 +5,12 @@ end # USERS +anonymous = User.create! :first_name => 'an anonymous', + :email => 'an-anonymous@example.com', + :password => 'a password', + :verified_at => Time.now, + :anonymous => true + user = User.create! :first_name => 'a user', :email => 'a-user@example.com', :password => 'a password', engines/adva_cms/test/fixtures.rb @@ -188,11 +188,11 @@ class AdminArticlesControllerTest < ActionController::TestCase with :access_granted do it_assigns :site, :section, :article it_renders :template, :edit - end - has_form_putting_to admin_article_path do - shows :form - # assert that the taglist field works when taglist contains double quotes + has_form_putting_to admin_article_path do + shows :form + # assert that the taglist field works when taglist contains double quotes + end end end end @@ -210,11 +210,11 @@ class AdminArticlesControllerTest < ActionController::TestCase with :access_granted do it_assigns :site, :section, :article it_renders :template, :edit - end - has_form_putting_to admin_article_path do - shows :form - # assert that the taglist field works when taglist contains double quotes + has_form_putting_to admin_article_path do + shows :form + # assert that the taglist field works when taglist contains double quotes + end end end end @@ -254,10 +254,10 @@ class AdminArticlesControllerTest < ActionController::TestCase with :a_published_article do with "no version param" do - with :access_granted do - with :valid_article_params do - it_guards_permissions :update, :article - + with :valid_article_params do + it_guards_permissions :update, :article + + with :access_granted do it_assigns :site, :section, :article it_updates :article it_redirects_to { edit_admin_article_url(@site, @section, @article) } @@ -270,8 +270,10 @@ class AdminArticlesControllerTest < ActionController::TestCase with(:save_revision_param) { it_versions :article } with(:no_save_revision_param) { it_does_not_version :article } end - - with :invalid_article_params do + end + + with :invalid_article_params do + with :access_granted do it_assigns :site, :section, :article it_renders :template, :edit it_assigns_flash_cookie :error => :not_nil engines/adva_cms/test/functional/admin/articles_controller_test.rb @@ -39,9 +39,9 @@ class AdminSectionsControllerTest < ActionController::TestCase describe "GET to :index" do action { get :index, default_params } - - it_guards_permissions :show, :sections - + + it_guards_permissions :show, :section + with :access_granted do it_assigns :site, :sections it_renders :template, :index do @@ -117,7 +117,7 @@ class AdminSectionsControllerTest < ActionController::TestCase action do Section.with_observers :section_sweeper do params = default_params.merge(@params).merge(:id => @section.id) - params[:section][:title] = "#{@section.title} was changed" if params[:section][:title].present? + params[:section][:title] = "#{@section.title} was changed" unless params[:section][:title].blank? put :update, params end end engines/adva_cms/test/functional/admin/sections_controller_test.rb @@ -31,7 +31,16 @@ class ActiveSupport::TestCase teardown :rollback_db_transaction! teardown :clear_cache_dir! teardown :rollback_multi_site_mode! + + setup do + @default_permissions = Rbac::Context.default_permissions.dup + end + teardown do + Rbac::Context.default_permissions = @default_permissions + end + + def set_locale! I18n.locale = nil I18n.default_locale = :en engines/adva_cms/test/test_helper.rb @@ -22,26 +22,48 @@ module With # mock(@controller).has_permission?(action, type) # end return unless With.aspect?(:access_control) + + with "(rbac)" do + # before do + # @default_permission = Rbac::Context.default_permissions[:"#{action} #{type}"] + # end + # + # after do + # Rbac::Context.default_permissions[:"#{action} #{type}"] = @default_permission + # end - with :"superuser_may_#{action}_#{type}" do - it_denies_access :with => [:is_anonymous, :is_user, :is_moderator, :is_admin] - it_grants_access :with => [:is_superuser] - end + with "only_superuser_may_#{action}_#{type}" do + before do + Rbac::Context.default_permissions[:"#{action} #{type}"] = [:superuser] + end - with :"admin_may_#{action}_#{type}" do - it_denies_access :with => [:is_anonymous, :is_user, :is_moderator] - it_grants_access :with => [:is_admin, :is_superuser] - end + it_denies_access :with => [:is_anonymous, :is_user, :is_moderator, :is_admin] + it_grants_access :with => [:is_superuser] + end + + with "admin_may_#{action}_#{type}" do + before do + Rbac::Context.default_permissions[:"#{action} #{type}"] = [:admin] + end + + it_denies_access :with => [:is_anonymous, :is_user, :is_moderator] + it_grants_access :with => [:is_admin, :is_superuser] + end - with :"moderator_may_#{action}_#{type}" do - it_denies_access :with => [:is_anonymous, :is_user] - it_grants_access :with => [:is_admin, :is_superuser] - # FIXME should grant to :is_moderator, but currently require_authentication requires an :admin role + with "moderator_may_#{action}_#{type}" do + before do + Rbac::Context.default_permissions[:"#{action} #{type}"] = [:moderator] + end + + it_denies_access :with => [:is_anonymous, :is_user] + it_grants_access :with => [:is_admin, :is_superuser] + # FIXME should grant to :is_moderator, but currently require_authentication requires an :admin role + end end end def it_grants_access(options = {}) - contexts = options[:with] ? with(*options[:with]) : [self] + contexts = options[:with] ? with(options[:with]) : [self] contexts.each do |context| context.assertion "it grants access" do message = "expected to grant access but %s" @@ -52,7 +74,7 @@ module With end def it_denies_access(options = {}) - contexts = options[:with] ? with(*options[:with]) : [self] + contexts = options[:with] ? with(options[:with]) : [self] contexts.each do |context| context.assertion "it denies access" do message = "expected to render :insufficient_permissions or redirect to login_path but did neither of these." @@ -136,7 +158,7 @@ class ActionController::TestCase end def rendered_insufficient_permissions? - !!(@response.rendered_template.to_s =~ /insufficient_permissions/) + !!(@response.rendered.to_s =~ /insufficient_permissions/) end def redirected_to_login? engines/adva_cms/test/test_helper/extensions/with_sugar.rb @@ -10,7 +10,7 @@ OptionParser.new do |o| end o.on('-w', '--with=ASPECTS', "Run tests defined for the given ASPECTS (comma separated).") do |aspects| - With.aspects += aspects.split(/,/) + With.aspects += aspects.split(/,/).map(&:to_sym) end end.parse!(ARGV) engines/adva_cms/test/test_helper/parse_options.rb @@ -41,8 +41,8 @@ module RolesHelper end def authorized_link_to(text, url, action, object, options = {}) - add_authorizing_css_classes! options, action, object - link_to text, url, options + add_authorizing_css_classes!(options, action, object) + link_to(text, url, options) end # Adds the css class required-roles as well as a couple of css classes that engines/adva_rbac/app/helpers/roles_helper.rb @@ -10,6 +10,27 @@ class RbacUserTest < ActiveSupport::TestCase ] end + # the roles association + # FIXME implement ... + + # stub_scenario :user_having_several_roles + # test 'roles.by_site returns all superuser, site and section roles for the given user' do + # roles = @user.roles.by_site(@site) + # roles.map(&:type).should == ['Rbac::Role::Superuser', 'Rbac::Role::Admin', 'Rbac::Role::Moderator'] + # end + # + # test 'roles.by_context returns all roles by_site for the given object' do + # roles = @user.roles.by_context(@site) + # roles.map(&:type).should == ['Rbac::Role::Superuser', 'Rbac::Role::Admin', 'Rbac::Role::Moderator'] + # end + # + # test 'roles.by_context adds the implicit roles for the given object if it has any' do + # @topic.stub!(:implicit_roles).and_return [@comment_author_role] + # roles = @user.roles.by_context(@topic) + # roles.map(&:type).should == ['Rbac::Role::Superuser', 'Rbac::Role::Admin', 'Rbac::Role::Moderator', 'Rbac::Role::Author'] + # end + # + test 'makes the new user a superuser' do user = User.create_superuser(@valid_user_params) user.has_role?(:superuser).should be_true engines/adva_rbac/test/unit/models/rbac_user_test.rb @@ -26,26 +26,6 @@ class UserTest < ActiveSupport::TestCase @user.should have_many(:roles) end - # the roles association - # FIXME implement ... - - # stub_scenario :user_having_several_roles - # test 'roles.by_site returns all superuser, site and section roles for the given user' do - # roles = @user.roles.by_site(@site) - # roles.map(&:type).should == ['Rbac::Role::Superuser', 'Rbac::Role::Admin', 'Rbac::Role::Moderator'] - # end - # - # test 'roles.by_context returns all roles by_site for the given object' do - # roles = @user.roles.by_context(@site) - # roles.map(&:type).should == ['Rbac::Role::Superuser', 'Rbac::Role::Admin', 'Rbac::Role::Moderator'] - # end - # - # test 'roles.by_context adds the implicit roles for the given object if it has any' do - # @topic.stub!(:implicit_roles).and_return [@comment_author_role] - # roles = @user.roles.by_context(@topic) - # roles.map(&:type).should == ['Rbac::Role::Superuser', 'Rbac::Role::Admin', 'Rbac::Role::Moderator', 'Rbac::Role::Author'] - # end - # # VALIDATIONS test "validates the presence of a first name" do @@ -130,12 +110,12 @@ class UserTest < ActiveSupport::TestCase test 'User.create_superuser verifies the user' do user = User.create_superuser(@valid_user_params) - user.should be_verified + user.verified?.should be_true end test 'User.create_superuser saves the user' do user = User.create_superuser(@valid_user_params) - user.should_not be_new_record + user.new_record?.should be_false end test 'assigns the password hash' do engines/adva_user/test/unit/models/user_test.rb @@ -26,6 +26,7 @@ class UserTest < ActiveSupport::TestCase @user.should have_many(:roles) end +<<<<<<< HEAD # the roles association # FIXME implement ... @@ -46,6 +47,8 @@ class UserTest < ActiveSupport::TestCase # roles.map(&:type).should == ['Rbac::Role::Superuser', 'Rbac::Role::Admin', 'Rbac::Role::Moderator', 'Rbac::Role::Author'] # end # +======= +>>>>>>> move roles tests to adva_rbac, re-enable --with :access_control # VALIDATIONS test "validates the presence of a first name" do @@ -97,20 +100,7 @@ class UserTest < ActiveSupport::TestCase @credentials[:password] = 'wrong password' User.authenticate(@credentials).should be_false end -<<<<<<< HEAD - - # User.superuser - test 'User.superusers returns all superusers' do - superuser = User.find_by_first_name('a superuser') - - result = User.superusers - result.should include(superuser) - result.size.should == 1 - end - -======= ->>>>>>> integrating new rbac library # User.admins_and_superusers test 'User.admins_and_superusers returns all site admins and superusers' do admin = User.find_by_first_name('an admin') @@ -156,37 +146,9 @@ class UserTest < ActiveSupport::TestCase user.password_hash.should_not be_blank user.password_salt.should_not be_blank end -<<<<<<< HEAD - - test 'makes the new user a superuser' do - user = User.create_superuser(@valid_user_params) - user.should have_role(:superuser) - end - - # User.by_context_and_role - test "User.by_context_and_role finds all superusers" do - users = User.by_context_and_role(nil, :superuser) - users.size.should == 1 - end - - test "User.by_context_and_role finds all admins of a given site" do - site = Site.find_by_name('site with blog') - users = User.by_context_and_role(site, :admin) - users.size.should == 1 - end - - # INSTANCE METHODS - - test '#attributes= calls update_roles if attributes have a :roles key' do - mock(@user).update_roles(anything) - @user.attributes= { :roles => 'roles' } - end - -======= # INSTANCE METHODS ->>>>>>> integrating new rbac library test '#verify! sets the verified_at timestamp and saves the user' do @user.update_attributes(:verified_at => nil) @user.verify! @@ -200,14 +162,14 @@ class UserTest < ActiveSupport::TestCase # end test '#anonymous? returns true when anonymous is true' do - User.new(:anonymous => true).should be_anonymous - User.new.should_not be_anonymous + User.new(:anonymous => true).anonymous?.should be_true + User.new.anonymous?.should be_false end # registered? test '#registered? returns true when the record is not new' do - @user.should be_registered - User.new.should_not be_registered + @user.registered?.should be_true + User.new.registered?.should be_false end test '#to_s returns the name' do # FIXME hu? where's that used? @@ -231,34 +193,4 @@ class UserTest < ActiveSupport::TestCase test "#email_with_name returns formatted string to use with email headers" do @user.email_with_name.should == "a user <a-user@example.com>" end -<<<<<<< HEAD - - def role_attributes - { "0" => { "type" => "Rbac::Role::Superuser", "selected" => "1" }, - "1" => { "type" => "Rbac::Role::Admin", "context_id" => Site.first.id, "context_type" => "Site", "selected" => "1" } } - end - - test 'clears existing roles' do - mock(@user.roles).clear - @user.update_roles(role_attributes) - end - - test 'creates new roles from the given attributes' do - @user.roles.should be_empty - - @user.update_roles(role_attributes) - @user.roles(true).size.should == 2 - end - - test 'ignores parameters that do not have the :selected flag set' do - @user.roles.should be_empty - - attributes = role_attributes - attributes['0']['selected'] = '0' - @user.update_roles(attributes) - - @user.roles(true).size.should == 1 - end -======= ->>>>>>> integrating new rbac library end engines/adva_user/test/unit/models/user_test.rb.orig @@ -50,60 +50,63 @@ end unless ARGV.first == 'TEST' require 'test/unit' - Runner.run(*ARGV.reject { |arg| arg =~ /^-/ || arg =~ /\=/ }) + i = (ARGV.index(ARGV.detect { |arg| arg =~ /^-/ || arg =~ /\=/ }) || ARGV.length) - 1 + + Runner.run(*ARGV[0..i]) + # Runner.run(*ARGV.reject { |arg| arg =~ /^-/ || arg =~ /\=/ }) # doesn't work as expected result = Test::Unit::AutoRunner.run # calling exit would not run the at_exit hook? exit(result) end -require 'test/unit' - -class RunnerPathTest < Test::Unit::TestCase - def test_defaults_to_vendor_plugins - assert_equal 'vendor/plugins', Runner::Path.new.path - end - - def test_expands_to_expected_full_path - assert_equal "#{root_dir}/vendor/adva", Runner::Path.new('vendor/adva').expand - end - - def test_finds_test_dir_for_single_engine - dir = Runner::Path.new('vendor/adva/engines/adva_cms') - assert_equal "#{root_dir}/vendor/adva/engines/adva_cms/test", dir.test_dirs.first - end - - def test_finds_test_dirs_for_multiple_engines - dir = Runner::Path.new('vendor/adva/engines') - test_dirs = dir.test_dirs.select { |d| d =~ %r(vendor/adva/engines/adva_.*/test) } - assert_equal test_dirs, dir.test_dirs - end - - def test_finds_test_dirs_for_multiple_symlinked_plugins - dir = Runner::Path.new('vendor/plugins') - test_dirs = dir.test_dirs.select { |d| d =~ %r(vendor/plugins/adva_.*/test) } - assert_equal test_dirs, dir.test_dirs - end - - def test_finds_test_files_for_single_engine - dir = Runner::Path.new('vendor/adva/engines/adva_cms') - test_files = dir.test_files.select { |d| d =~ %r(vendor/adva/engines/adva_cms/test/.*_test\.rb) } - assert_equal test_files, dir.test_files - end - - def test_finds_test_files_for_multiple_engines - dir = Runner::Path.new('vendor/adva/engines') - test_files = dir.test_files.select { |d| d =~ %r(vendor/adva/engines/adva_.*/test/.*_test\.rb) } - assert_equal test_files, dir.test_files - end - - def test_finds_test_files_for_multiple_symlinked_plugins - dir = Runner::Path.new('vendor/plugins') - test_files = dir.test_files.select { |d| d =~ %r(vendor/plugins/adva_.*/test/.*_test\.rb) } - assert_equal test_files, dir.test_files - end - - protected - def root_dir - File.expand_path(File.dirname(__FILE__)).sub(%r(/vendor/.*), '') - end -end \ No newline at end of file +# require 'test/unit' +# +# class RunnerPathTest < Test::Unit::TestCase +# def test_defaults_to_vendor_plugins +# assert_equal 'vendor/plugins', Runner::Path.new.path +# end +# +# def test_expands_to_expected_full_path +# assert_equal "#{root_dir}/vendor/adva", Runner::Path.new('vendor/adva').expand +# end +# +# def test_finds_test_dir_for_single_engine +# dir = Runner::Path.new('vendor/adva/engines/adva_cms') +# assert_equal "#{root_dir}/vendor/adva/engines/adva_cms/test", dir.test_dirs.first +# end +# +# def test_finds_test_dirs_for_multiple_engines +# dir = Runner::Path.new('vendor/adva/engines') +# test_dirs = dir.test_dirs.select { |d| d =~ %r(vendor/adva/engines/adva_.*/test) } +# assert_equal test_dirs, dir.test_dirs +# end +# +# def test_finds_test_dirs_for_multiple_symlinked_plugins +# dir = Runner::Path.new('vendor/plugins') +# test_dirs = dir.test_dirs.select { |d| d =~ %r(vendor/plugins/adva_.*/test) } +# assert_equal test_dirs, dir.test_dirs +# end +# +# def test_finds_test_files_for_single_engine +# dir = Runner::Path.new('vendor/adva/engines/adva_cms') +# test_files = dir.test_files.select { |d| d =~ %r(vendor/adva/engines/adva_cms/test/.*_test\.rb) } +# assert_equal test_files, dir.test_files +# end +# +# def test_finds_test_files_for_multiple_engines +# dir = Runner::Path.new('vendor/adva/engines') +# test_files = dir.test_files.select { |d| d =~ %r(vendor/adva/engines/adva_.*/test/.*_test\.rb) } +# assert_equal test_files, dir.test_files +# end +# +# def test_finds_test_files_for_multiple_symlinked_plugins +# dir = Runner::Path.new('vendor/plugins') +# test_files = dir.test_files.select { |d| d =~ %r(vendor/plugins/adva_.*/test/.*_test\.rb) } +# assert_equal test_files, dir.test_files +# end +# +# protected +# def root_dir +# File.expand_path(File.dirname(__FILE__)).sub(%r(/vendor/.*), '') +# end +# end \ No newline at end of file script/test engines/adva_user/test/integration/user_rbac_test.rb engines/adva_user/test/unit/helpers/roles_helper_test.rb 670487bed3feb04b8958633677e4cff9350992c9 Sven Fuchs svenfuchs@artweb-design.de http://github.com/svenfuchs/adva_cms/commit/74f0d4484b6776f72d5544ea7754871617f9b912 74f0d4484b6776f72d5544ea7754871617f9b912 2009-10-27T06:06:22-07:00 2009-07-21T08:04:21-07:00 move roles tests to adva_rbac, re-enable --with :access_control e54640d2ed30e6edc2f592f1a554024a7a315e7b Raphaela Wrede rwrede@adva-business.com