Skip to content

Commit

Permalink
Fix pending?
Browse files Browse the repository at this point in the history
  • Loading branch information
alexjfisher committed Oct 11, 2022
1 parent 94969d0 commit 531387c
Showing 1 changed file with 26 additions and 12 deletions.
38 changes: 26 additions & 12 deletions spec/acceptance/grafana_datasource_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@ class { 'grafana':
end

if Gem::Version.new(grafana_version) > Gem::Version.new('9')
context 'with basic auth in secure json data', pending: true do
it_behaves_like 'an idempotent resource' do
let(:manifest) do
<<-PUPPET
context 'with basic auth in secure json data' do
let(:manifest) do
<<-PUPPET
grafana_datasource { 'prometheus2':
grafana_url => 'http://localhost:3000',
grafana_user => 'admin',
Expand All @@ -68,8 +67,16 @@ class { 'grafana':
},
basic_auth_user => 'prom_user',
}
PUPPET
end
PUPPET
end

it 'works with no errors' do
apply_manifest_on(default, manifest, catch_failures: true)
end

it 'is idempotent' do
pending('secure_json_data is not returned by API')
apply_manifest_on(default, manifest, catch_changes: true)
end
end
else
Expand Down Expand Up @@ -100,10 +107,9 @@ class { 'grafana':

describe 'influxdb ds' do
if Gem::Version.new(grafana_version) > Gem::Version.new('9')
context 'with password in secure_json_data', pending: true do
it_behaves_like 'an idempotent resource' do
let(:manifest) do
<<-PUPPET
context 'with password in secure_json_data' do
let(:manifest) do
<<-PUPPET
grafana_datasource { 'influxdb':
grafana_url => 'http://localhost:3000',
grafana_user => 'admin',
Expand All @@ -117,8 +123,16 @@ class { 'grafana':
},
database => 'mydb',
}
PUPPET
end
PUPPET
end

it 'works with no errors' do
apply_manifest_on(default, manifest, catch_failures: true)
end

it 'is idempotent' do
pending('secure_json_data is not returned by API')
apply_manifest_on(default, manifest, catch_changes: true)
end
end
else
Expand Down

0 comments on commit 531387c

Please sign in to comment.