X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=3rdparty%2Fmodules%2Fkeystone%2Fspec%2Fclasses%2Fkeystone_roles_admin_spec.rb;fp=3rdparty%2Fmodules%2Fkeystone%2Fspec%2Fclasses%2Fkeystone_roles_admin_spec.rb;h=bbd6d953b8316995b7514cdf445521da5b808f1d;hb=71a236efd9f45828d875a0a5fd025108bb1dcada;hp=ba7d53296a2ac115a11ad0bd48031d4e3fe7abad;hpb=52e13a709b5b959cd8995e7fa4f1b226bbe13a87;p=dsa-puppet.git

diff --git a/3rdparty/modules/keystone/spec/classes/keystone_roles_admin_spec.rb b/3rdparty/modules/keystone/spec/classes/keystone_roles_admin_spec.rb
index ba7d5329..bbd6d953 100644
--- a/3rdparty/modules/keystone/spec/classes/keystone_roles_admin_spec.rb
+++ b/3rdparty/modules/keystone/spec/classes/keystone_roles_admin_spec.rb
@@ -11,17 +11,17 @@ describe 'keystone::roles::admin' do
       }
     end
 
-    it { should contain_keystone_tenant('services').with(
+    it { is_expected.to contain_keystone_tenant('services').with(
       :ensure      => 'present',
       :enabled     => true,
       :description => 'Tenant for the openstack services'
     )}
-    it { should contain_keystone_tenant('openstack').with(
+    it { is_expected.to contain_keystone_tenant('openstack').with(
       :ensure      => 'present',
       :enabled     => true,
       :description => 'admin tenant'
     )}
-    it { should contain_keystone_user('admin').with(
+    it { is_expected.to contain_keystone_user('admin').with(
       :ensure                 => 'present',
       :enabled                => true,
       :tenant                 => 'openstack',
@@ -29,8 +29,8 @@ describe 'keystone::roles::admin' do
       :password               => 'ChangeMe',
       :ignore_default_tenant  => 'false'
     )}
-    it { should contain_keystone_role('admin').with_ensure('present') }
-    it { should contain_keystone_user_role('admin@openstack').with(
+    it { is_expected.to contain_keystone_role('admin').with_ensure('present') }
+    it { is_expected.to contain_keystone_user_role('admin@openstack').with(
       :roles  => ['admin'],
       :ensure => 'present'
     )}
@@ -53,17 +53,17 @@ describe 'keystone::roles::admin' do
       }
     end
 
-    it { should contain_keystone_tenant('foobar').with(
+    it { is_expected.to contain_keystone_tenant('foobar').with(
       :ensure  => 'present',
       :enabled => true,
       :description => 'foobar description'
     )}
-    it { should contain_keystone_tenant('admin').with(
+    it { is_expected.to contain_keystone_tenant('admin').with(
       :ensure      => 'present',
       :enabled     => true,
       :description => 'admin something else'
     )}
-    it { should contain_keystone_user('admin').with(
+    it { is_expected.to contain_keystone_user('admin').with(
       :ensure                 => 'present',
       :enabled                => true,
       :tenant                 => 'admin',
@@ -71,7 +71,7 @@ describe 'keystone::roles::admin' do
       :password               => 'foo',
       :ignore_default_tenant  => 'true'
     )}
-    it { should contain_keystone_user_role('admin@admin').with(
+    it { is_expected.to contain_keystone_user_role('admin@admin').with(
       :roles  => ['admin', 'heat_stack_owner'],
       :ensure => 'present'
     )}
@@ -86,8 +86,8 @@ describe 'keystone::roles::admin' do
         }
       end
 
-      it { should_not contain_keystone_user('keystone') }
-      it { should contain_keystone_user_role('keystone@openstack') }
+      it { is_expected.to_not contain_keystone_user('keystone') }
+      it { is_expected.to contain_keystone_user_role('keystone@openstack') }
     end
   end
 
@@ -100,8 +100,8 @@ describe 'keystone::roles::admin' do
         }
       end
 
-      it { should_not contain_keystone_user('keystone') }
-      it { should_not contain_keystone_user_role('keystone@openstack') }
+      it { is_expected.to_not contain_keystone_user('keystone') }
+      it { is_expected.to_not contain_keystone_user_role('keystone@openstack') }
     end
   end