Skip to content

Commit dd301f6

Browse files
committed
Pin tests to rspec < 2.99
Pin to rspec < 2.99 until rspec-puppet officially supports rspec 3.x. This is to avoid warnings due to deprecated matchers in the rspec-puppet gem. This patch also reverts the change of be_false to be_falsey that was temporarily required for rspec 3 compability. Partial-Bug: #1326034 Change-Id: I1f7a754cf285c598169059e757c1a905762e2ce0
1 parent dd91a68 commit dd301f6

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ group :development, :test do
77
gem 'puppet-lint', '~> 0.3.2'
88
gem 'rake', '10.1.1'
99
gem 'webmock'
10+
gem 'rspec', '< 2.99'
1011
end
1112

1213
if puppetversion = ENV['PUPPET_GEM_VERSION']

spec/unit/provider/nova_admin_tenant_id_setter/neutron_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def create
7474
it 'should create a resource' do
7575
resource = Puppet::Type::Nova_admin_tenant_id_setter.new(params)
7676
provider = provider_class.new(resource)
77-
expect(provider.exists?).to be_falsey
77+
expect(provider.exists?).to be_false
7878
expect(provider.create).to be_nil
7979
end
8080
end
@@ -98,7 +98,7 @@ def create
9898
it 'should receive an api error' do
9999
resource = Puppet::Type::Nova_admin_tenant_id_setter.new(params)
100100
provider = provider_class.new(resource)
101-
expect(provider.exists?).to be_falsey
101+
expect(provider.exists?).to be_false
102102
expect { provider.create }.to raise_error KeystoneAPIError, /Unable to find matching tenant/
103103
end
104104
end
@@ -123,7 +123,7 @@ def create
123123
it 'should receive an api error' do
124124
resource = Puppet::Type::Nova_admin_tenant_id_setter.new(params)
125125
provider = provider_class.new(resource)
126-
expect(provider.exists?).to be_falsey
126+
expect(provider.exists?).to be_false
127127
expect { provider.create }.to raise_error KeystoneAPIError, /Found multiple matches for tenant name/
128128
end
129129
end
@@ -140,7 +140,7 @@ def create
140140
it 'should receive an authentication error' do
141141
resource = Puppet::Type::Nova_admin_tenant_id_setter.new(params)
142142
provider = provider_class.new(resource)
143-
expect(provider.exists?).to be_falsey
143+
expect(provider.exists?).to be_false
144144
expect { provider.create }.to raise_error KeystoneAPIError
145145
end
146146
end
@@ -154,7 +154,7 @@ def create
154154
it 'should receive a connection error' do
155155
resource = Puppet::Type::Nova_admin_tenant_id_setter.new(params)
156156
provider = provider_class.new(resource)
157-
expect(provider.exists?).to be_falsey
157+
expect(provider.exists?).to be_false
158158
expect { provider.create }.to raise_error KeystoneConnectionError
159159
end
160160
end
@@ -168,7 +168,7 @@ def create
168168
it 'should receive a connection error' do
169169
resource = Puppet::Type::Nova_admin_tenant_id_setter.new(params)
170170
provider = provider_class.new(resource)
171-
expect(provider.exists?).to be_falsey
171+
expect(provider.exists?).to be_false
172172
expect { provider.create }.to raise_error KeystoneConnectionError
173173
end
174174
end

0 commit comments

Comments
 (0)