diff --git a/lib/puppet/provider/mongodb_database/mongodb.rb b/lib/puppet/provider/mongodb_database/mongodb.rb index 74667682b..cbf658e70 100644 --- a/lib/puppet/provider/mongodb_database/mongodb.rb +++ b/lib/puppet/provider/mongodb_database/mongodb.rb @@ -22,7 +22,7 @@ def self.instances catch (err) { rs.slaveOk() } - '.squeeze(" ") + '.squeeze(' ') mongo_eval_result = mongo_eval("#{pre_cmd};JSON.stringify(db.getMongo().getDBs())") dbs = JSON.parse mongo_eval_result diff --git a/spec/acceptance/server_spec.rb b/spec/acceptance/server_spec.rb index 2970acca5..7e247963b 100644 --- a/spec/acceptance/server_spec.rb +++ b/spec/acceptance/server_spec.rb @@ -25,14 +25,13 @@ service_name = 'mongod' package_name = 'mongodb-org-server' end - major_version=fact('mongodb_version').split('.')[0].to_i - if major_version>=5 - mongo_cli=mongosh + major_version = fact('mongodb_version').split('.')[0].to_i + mongo_cli = if major_version >= 5 + 'mongosh' else - mongo_cli=mongo + 'mongo' end - describe 'installation' do it 'works with no errors' do pp = <<-EOS @@ -150,8 +149,6 @@ class { 'mongodb::client': } its(:stdout) { is_expected.to match '13' } end - - describe file("/root/.#{mongo_cli}.js") do it { is_expected.to be_file } it { is_expected.to be_owned_by 'root' } diff --git a/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb b/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb index dea509888..27aa72281 100644 --- a/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb +++ b/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb @@ -51,7 +51,7 @@ catch (err) { rs.slaveOk() } - ;JSON.stringify(db.getMongo().getDBs())'.squeeze(" ") + ;JSON.stringify(db.getMongo().getDBs())'.squeeze(' ') allow(provider.class).to receive(:mongo_eval).with(mongodb_eval_command).and_return(raw_dbs) allow(provider.class).to receive(:db_ismaster).and_return(true) end