Alberich integration: spec test changes

Author: sseago

src/spec/controllers/permissions_controller_spec.rb src/spec/controllers/alberich/permissions_controller_spec.rb

@@ -16,7 +16,7 @@
 
 require 'spec_helper'
 
-describe PermissionsController do
+describe Alberich::PermissionsController do
 
   before(:each) do
     @admin_permission = FactoryGirl.create :admin_permission
@@ -35,8 +35,7 @@
 
     post :multi_update, :permission_object_id => @deployable.id, :permission_object_type => @deployable.class.to_s,
         :permission_role_selected => ["#{@permission.id},#{@new_role.id}"], :polymorphic_path_extras => { 'catalog_id' => @catalog.id}
-
-    response.should redirect_to catalog_deployable_path(@catalog, @deployable, :return_from_permission_change => true)
+    response.should redirect_to Rails.application.class.routes.url_helpers.catalog_deployable_path(@catalog, @deployable, :return_from_permission_change => true)
   end
 
   it "should work for global role grants" do

src/spec/controllers/config_servers_controller_spec.rb

@@ -26,7 +26,7 @@
     before(:each) do
       @config_server = Factory :mock_config_server
       @provider_account = @config_server.provider_account
-      @admin_permission = Permission.create :role => Role.find(:first, :conditions => ['name = ?', 'Role|Global Provider Administrator']),
+      @admin_permission = Alberich::Permission.create :role => Alberich::Role.find(:first, :conditions => ['name = ?', 'Role|Global Provider Administrator']),
                                             :permission_object => @provider_account.provider,
                                             :entity => FactoryGirl.create(:provider_admin_user).entity
       @admin = @admin_permission.user
@@ -49,7 +49,7 @@
   context "creating config servers" do
     before(:each) do
       @provider_account = Factory :mock_provider_account
-      @admin_permission = Permission.create :role => Role.find(:first, :conditions => ['name = ?', 'Role|Global Provider Administrator']),
+      @admin_permission = Alberich::Permission.create :role => Alberich::Role.find(:first, :conditions => ['name = ?', 'Role|Global Provider Administrator']),
                                             :permission_object => @provider_account.provider,
                                             :entity => FactoryGirl.create(:provider_admin_user).entity
       @admin = @admin_permission.user

src/spec/controllers/provider_accounts_controller_spec.rb

@@ -27,7 +27,7 @@
       @provider_account = FactoryGirl.create :mock_provider_account
       @provider = @provider_account.provider
 
-      @admin_permission = Permission.create :role => Role.find(:first, :conditions => ['name = ?', 'Role|Global Provider Administrator']),
+      @admin_permission = Alberich::Permission.create :role => Alberich::Role.find(:first, :conditions => ['name = ?', 'Role|Global Provider Administrator']),
         :permission_object => @provider,
         :entity => FactoryGirl.create(:provider_admin_user).entity
       @admin = @admin_permission.user

src/spec/factories/permission.rb src/spec/factories/alberich/permission.rb

@@ -16,55 +16,55 @@
 
 FactoryGirl.define do
 
-  factory :permission do
+  factory :permission, :class => Alberich::Permission do
     after_build { |p| p.entity.permissions << p }
   end
 
   factory :admin_permission, :parent => :permission do
-    role { |r| Role.first(:conditions => ['name = ?', 'Role|Global Administrator']) || FactoryGirl.create(:role, :name => 'Role|Global Administrator') }
-    permission_object { |r| BasePermissionObject.general_permission_scope }
+    role { |r| Alberich::Role.first(:conditions => ['name = ?', 'Role|Global Administrator']) || FactoryGirl.create(:role, :name => 'Role|Global Administrator') }
+    permission_object { |r| Alberich::BasePermissionObject.general_permission_scope }
     entity { |r| FactoryGirl.create(:admin_user).entity }
   end
 
   factory :provider_admin_permission, :parent => :permission do
-    role { |r| Role.first(:conditions => ['name = ?', 'Role|Global Administrator']) || FactoryGirl.create(:role, :name => 'Role|Global Provider Administrator') }
+    role { |r| Alberich::Role.first(:conditions => ['name = ?', 'Role|Global Administrator']) || FactoryGirl.create(:role, :name => 'Role|Global Provider Administrator') }
     permission_object { |r| r.association(:mock_provider) }
     entity { |r| FactoryGirl.create(:provider_admin_user).entity }
   end
 
   factory :pool_creator_permission, :parent => :permission do
-    role { |r| Role.first(:conditions => ['name = ?', 'base.pool.creator']) || FactoryGirl.create(:role, :name => 'base.pool.creator') }
-    permission_object { |r| BasePermissionObject.general_permission_scope }
+    role { |r| Alberich::Role.first(:conditions => ['name = ?', 'base.pool.creator']) || FactoryGirl.create(:role, :name => 'base.pool.creator') }
+    permission_object { |r| Alberich::BasePermissionObject.general_permission_scope }
     entity { |r| FactoryGirl.create(:pool_creator_user).entity }
   end
 
   factory :pool_user_permission, :parent => :permission do
-    role { |r| Role.first(:conditions => ['name = ?', 'Role|Pool User']) || FactoryGirl.create(:role, :name => 'Role|Pool User') }
+    role { |r| Alberich::Role.first(:conditions => ['name = ?', 'Role|Pool User']) || FactoryGirl.create(:role, :name => 'Role|Pool User') }
     permission_object { |r| r.association(:pool) }
     entity { |r| FactoryGirl.create(:pool_user).entity }
   end
 
   factory :pool_user2_permission, :parent => :permission do
-    role { |r| Role.first(:conditions => ['name = ?', 'Role|Pool User']) || FactoryGirl.create(:role, :name => 'Role|Pool User') }
+    role { |r| Alberich::Role.first(:conditions => ['name = ?', 'Role|Pool User']) || FactoryGirl.create(:role, :name => 'Role|Pool User') }
     permission_object { |r| r.association(:pool) }
     entity { |r| FactoryGirl.create(:pool_user2).entity }
   end
 
   factory :pool_family_user_permission, :parent => :permission do
-    role { |r| Role.first(:conditions => ['name = ?', 'Role|Environment User']) || FactoryGirl.create(:role, :name => 'Role|Environment User') }
+    role { |r| Alberich::Role.first(:conditions => ['name = ?', 'Role|Environment User']) || FactoryGirl.create(:role, :name => 'Role|Environment User') }
     permission_object { |r| r.association(:pool_family) }
     entity { |r| FactoryGirl.create(:pool_family_user).entity }
   end
 
   factory :pool_family_admin_permission, :parent => :permission do
-    role { |r| Role.first(:conditions => ['name = ?', 'Role|Environment Administrator']) || FactoryGirl.create(:role, :name => 'Role|Environment Administrator') }
+    role { |r| Alberich::Role.first(:conditions => ['name = ?', 'Role|Environment Administrator']) || FactoryGirl.create(:role, :name => 'Role|Environment Administrator') }
     permission_object { |r| r.association(:pool_family) }
     entity { |r| FactoryGirl.create(:pool_family_user).entity }
   end
 
   factory :group_admin_permission, :parent => :permission do
-    role { |r| Role.first(:conditions => ['name = ?', 'Role|Global Administrator']) || FactoryGirl.create(:role, :name => 'Role|Global Administrator') }
-    permission_object { |r| BasePermissionObject.general_permission_scope }
+    role { |r| Alberich::Role.first(:conditions => ['name = ?', 'Role|Global Administrator']) || FactoryGirl.create(:role, :name => 'Role|Global Administrator') }
+    permission_object { |r| Alberich::BasePermissionObject.general_permission_scope }
     entity { |r| FactoryGirl.create(:user_group).entity }
   end
 

src/spec/factories/role.rb src/spec/factories/alberich/role.rb

@@ -15,7 +15,7 @@
 #
 
 FactoryGirl.define do
-  factory :role do
+  factory :role, :class => Alberich::Role do
     sequence(:name) { |n| "Role name #{n}" }
     scope 'Pool'
   end

src/spec/lib/deployable_matching/assembly_instances_builder_spec.rb

@@ -26,7 +26,7 @@
     admin = FactoryGirl.create(:admin_user)
     session = FactoryGirl.create(:session)
     permission_session =
-      PermissionSession.create!(:user => admin,
+      Alberich::PermissionSession.create!(:user => admin,
                                 :session_id => session.session_id)
 
     catalog = FactoryGirl.create(:catalog, :pool => @pool)
@@ -68,7 +68,7 @@
     admin = FactoryGirl.create(:admin_user)
     session = FactoryGirl.create(:session)
     permission_session =
-      PermissionSession.create!(:user => admin,
+      Alberich::PermissionSession.create!(:user => admin,
                                 :session_id => session.session_id)
 
     catalog = FactoryGirl.create(:catalog, :pool => @pool)
@@ -89,7 +89,7 @@
     admin = FactoryGirl.create(:admin_user)
     session = FactoryGirl.create(:session)
     permission_session =
-      PermissionSession.create!(:user => admin,
+      Alberich::PermissionSession.create!(:user => admin,
                                 :session_id => session.session_id)
 
     catalog = FactoryGirl.create(:catalog, :pool => @pool)

src/spec/models/derived_permission_spec.rb src/spec/models/alberich/derived_permission_spec.rb

@@ -16,7 +16,7 @@
 
 require 'spec_helper'
 
-describe DerivedPermission do
+describe Alberich::DerivedPermission do
 
   before(:each) do
     @admin_permission = FactoryGirl.create :admin_permission
@@ -35,8 +35,8 @@
 
   it "derived permissions created for instance" do
     derived_perms_count = @instance.derived_permissions.size
-    @pool_perm = Permission.create(:entity => @admin.entity,
-                                    :role => Role.first(:conditions =>
+    @pool_perm = Alberich::Permission.create(:entity => @admin.entity,
+                                    :role => Alberich::Role.first(:conditions =>
                                                ['name = ?', 'Role|Pool Administrator']),
                                      :permission_object => @pool)
     @instance.reload

src/spec/models/permission_spec.rb src/spec/models/alberich/permission_spec.rb

@@ -16,7 +16,7 @@
 
 require 'spec_helper'
 
-describe Permission do
+describe Alberich::Permission do
 
   before(:each) do
     @admin_permission = FactoryGirl.create :admin_permission
@@ -33,56 +33,56 @@
     @pool = @pool_user_permission.pool
     @session = FactoryGirl.create :session
     @session_id = @session.session_id
-    @permission_session = PermissionSession.create!(:user => @admin,
+    @permission_session = Alberich::PermissionSession.create!(:user => @admin,
                                                     :session_id => @session_id)
     @permission_session.update_session_entities(@admin)
     @permission_session.add_to_session(@provider_admin)
     @permission_session.add_to_session(@pool_user)
   end
 
   it "Admin should be able to create users" do
-    BasePermissionObject.general_permission_scope.has_privilege(@permission_session,
+    Alberich::BasePermissionObject.general_permission_scope.has_privilege(@permission_session,
                                                                 @admin,
-                                                                Privilege::CREATE,
+                                                                Alberich::Privilege::CREATE,
                                                                 User).should be_true
   end
 
   it "Provider Admin should NOT be able to create users" do
-    BasePermissionObject.general_permission_scope.has_privilege(@permission_session,
+    Alberich::BasePermissionObject.general_permission_scope.has_privilege(@permission_session,
                                                                 @provider_admin,
-                                                                Privilege::CREATE,
+                                                                Alberich::Privilege::CREATE,
                                                                 User).should be_false
   end
 
   it "Pool User should NOT be able to create users" do
-    BasePermissionObject.general_permission_scope.has_privilege(@permission_session,
+    Alberich::BasePermissionObject.general_permission_scope.has_privilege(@permission_session,
                                                                 @pool_user,
-                                                                Privilege::CREATE,
+                                                                Alberich::Privilege::CREATE,
                                                                 User).should be_false
   end
 
   it "Provider Admin should be able to edit provider" do
     @provider.has_privilege(@permission_session, @provider_admin,
-                            Privilege::MODIFY).should be_true
+                            Alberich::Privilege::MODIFY).should be_true
   end
 
   it "Admin should be able to edit provider" do
-    @provider.has_privilege(@permission_session, @admin, Privilege::MODIFY).should be_true
+    @provider.has_privilege(@permission_session, @admin, Alberich::Privilege::MODIFY).should be_true
   end
 
   it "Pool User should NOT be able to edit provider" do
     @provider.has_privilege(@permission_session, @pool_user,
-                            Privilege::MODIFY).should be_false
+                            Alberich::Privilege::MODIFY).should be_false
   end
 
   it "Pool User should be able to create instances in @pool" do
     @pool.has_privilege(@permission_session, @pool_user,
-                        Privilege::CREATE, Instance).should be_true
+                        Alberich::Privilege::CREATE, Instance).should be_true
   end
 
   it "Pool User should NOT be able to create instances in another pool" do
     FactoryGirl.create(:tpool).has_privilege(@permission_session, @pool_user,
-                                             Privilege::CREATE, Instance).
+                                             Alberich::Privilege::CREATE, Instance).
       should be_false
   end
 
@@ -91,16 +91,16 @@
     group_admin_permission = FactoryGirl.create(:group_admin_permission)
     user_group = group_admin_permission.user_group
     @permission_session.update_session_entities(newuser)
-    BasePermissionObject.general_permission_scope.has_privilege(@permission_session,
+    Alberich::BasePermissionObject.general_permission_scope.has_privilege(@permission_session,
                                                                 newuser,
-                                                                Privilege::CREATE,
+                                                                Alberich::Privilege::CREATE,
                                                                 User).should be_false
     user_group.members << newuser
     newuser.reload
     @permission_session.update_session_entities(newuser)
-    BasePermissionObject.general_permission_scope.has_privilege(@permission_session,
+    Alberich::BasePermissionObject.general_permission_scope.has_privilege(@permission_session,
                                                                 newuser,
-                                                                Privilege::CREATE,
+                                                                Alberich::Privilege::CREATE,
                                                                 User).should be_true
 
   end

src/spec/models/role_spec.rb src/spec/models/alberich/role_spec.rb

@@ -16,7 +16,7 @@
 
 require 'spec_helper'
 
-describe Role do
+describe Alberich::Role do
 
   it "should not be valid if name is too long" do
     u = FactoryGirl.create(:role)

src/spec/models/deployable_spec.rb

@@ -138,12 +138,12 @@
     catalog2 = FactoryGirl.create :catalog
     catalog1.pool.should_not == catalog2.pool
     admin = FactoryGirl.create :admin_user
-    pool1_perm = Permission.create(:entity => admin.entity,
-                                   :role => Role.first(:conditions =>
+    pool1_perm = Alberich::Permission.create(:entity => admin.entity,
+                                   :role => Alberich::Role.first(:conditions =>
                                                    ['name = ?', 'Role|Pool Administrator']),
                                      :permission_object => catalog1.pool)
-    pool2_perm = Permission.create(:entity => admin.entity,
-                                   :role => Role.first(:conditions =>
+    pool2_perm = Alberich::Permission.create(:entity => admin.entity,
+                                   :role => Alberich::Role.first(:conditions =>
                                         ['name = ?', 'Role|Pool Deployable Admin']),
                                      :permission_object => catalog2.pool)
     deployable = FactoryGirl.create :deployable, :catalogs => [catalog1]

src/spec/models/deployment_spec.rb

@@ -219,7 +219,7 @@
       @user_for_launch.quota.maximum_running_instances = 1
       @session = FactoryGirl.create :session
       @session_id = @session.session_id
-      @permission_session = PermissionSession.create!(:user => @user_for_launch,
+      @permission_session = Alberich::PermissionSession.create!(:user => @user_for_launch,
                                                       :session_id => @session_id)
       @permission_session.update_session_entities(@user_for_launch)
       @deployment.stub(:common_provider_accounts_for).and_return(["test","test"])
@@ -235,7 +235,7 @@
       @user_for_launch = admin_perms.user
       @session = FactoryGirl.create :session
       @session_id = @session.session_id
-      @permission_session = PermissionSession.create!(:user => @user_for_launch,
+      @permission_session = Alberich::PermissionSession.create!(:user => @user_for_launch,
                                                       :session_id => @session_id)
       @permission_session.update_session_entities(@user_for_launch)
       @instance_match = FactoryGirl.build(:instance_match)

src/spec/services/registration_service_spec.rb

@@ -39,7 +39,7 @@
       @user = FactoryGirl.create :user
       @session = FactoryGirl.create :session
       @session_id = @session.session_id
-      @permission_session = PermissionSession.create!(:user => @user,
+      @permission_session = Alberich::PermissionSession.create!(:user => @user,
                                                       :session_id => @session_id)
       @permission_session.update_session_entities(@user)
       @pool = MetadataObject.lookup("self_service_default_pool")
@@ -51,7 +51,7 @@
       @registration_service.save
 
       @pools = Pool.list_for_user(@permission_session, @user,
-                                  Privilege::CREATE, Instance)
+                                  Alberich::Privilege::CREATE, Instance)
       @pools.length.should == 1
       @pools[0].name.should == "Default"
 
@@ -72,7 +72,7 @@
         lambda do
           lambda do
             registration_process.save.should be_true
-          end.should change(Permission, :count).by(3)
+          end.should change(Alberich::Permission, :count).by(3)
         end.should change(User, :count).by(1)
       end.should change(Quota, :count).by(1)
 

src/spec/spec_helper.rb

@@ -64,7 +64,7 @@ def mock_warden(user)
   @session = ActiveRecord::SessionStore::Session.find_by_session_id(@session_id)
   @session = FactoryGirl.create :session unless @session
   if user
-    @permission_session = PermissionSession.create!(:user => user,
+    @permission_session = Alberich::PermissionSession.create!(:user => user,
                                                     :session_id => @session_id)
     request.session[:permission_session_id] = @permission_session.id
     @permission_session.update_session_entities(user)