CAT-1147 erb to epp conversion linting fix

puppetlabs · Aug 2, 2023 · 763c870 · 763c870
1 parent eadd13a
commit 763c870
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -95,6 +95,7 @@ RSpec/NamedSubject:
     - 'spec/classes/mysql_server_spec.rb'
     - 'spec/defines/mysql_db_spec.rb'
     - 'spec/functions/mysql_normalise_and_deepmerge_spec.rb'
+    - 'spec/functions/mysql_innobackupex_args_spec.rb'
     - 'spec/functions/mysql_strip_hash_spec.rb'
 
 # Offense count: 45

diff --git a/spec/functions/mysql_innobackupex_args_spec.rb b/spec/functions/mysql_innobackupex_args_spec.rb
@@ -11,37 +11,41 @@
     expect(subject).to run.with_params('', true, '', [], [])
   end
 
-  it 'returns args with username and password' do
-    expect(subject).to run.with_params('root', false, '12345', [], []).and_return('--user="root" --password="12345"')
-  end
+  context 'should work with username and password' do
+    it 'returns args with username and password' do
+      expect(subject).to run.with_params('root', false, '12345', [], []).and_return('--user="root" --password="12345"')
+    end
+
+    it 'returns args with database lists' do
+      expect(subject).to run.with_params('root', false, '12345', ['db1', 'db2'], []).and_return('--user="root" --password="12345" --databases="db1 db2"')
+    end
 
-  it 'returns args with database lists' do
-    expect(subject).to run.with_params('root', false, '12345', ['db1', 'db2'], []).and_return('--user="root" --password="12345" --databases="db1 db2"')
+    it 'returns args with backup compress only' do
+      expected_results = '--user="root" --password="12345" --compress'
+      expect(subject).to run.with_params('root', true, '12345', [], []).and_return(expected_results)
+    end
+
+    it 'returns args with backup compress, database list and optional_args' do
+      expected_results = '--user="root" --password="12345" --compress --databases="db1 db2" tst_arg_1 tst_arg_2'
+      expect(subject).to run.with_params('root', true, '12345', ['db1', 'db2'], ['tst_arg_1', 'tst_arg_2']).and_return(expected_results)
+    end
   end
 
-  it 'returns args without database list' do
-    expect(subject).to run.with_params('root', false, '12345', [], []).and_return('--user="root" --password="12345"')
+  context 'should work without database args' do
+    it 'returns args without database list' do
+      expect(subject).to run.with_params('root', false, '12345', [], []).and_return('--user="root" --password="12345"')
+    end
   end
 
   it 'returns args without backup compress' do
     expect(subject).to run.with_params('root', false, '12345', [], []).and_return('--user="root" --password="12345"')
   end
 
-  it 'returns args with backup compress only' do
-    expected_results = '--user="root" --password="12345" --compress'
-    expect(subject).to run.with_params('root', true, '12345', [], []).and_return(expected_results)
-  end
-
   it 'returns args with backup compress and database list' do
     expected_results = '--user="root" --password="12345" --compress --databases="db1 db2"'
     expect(subject).to run.with_params('root', true, '12345', ['db1', 'db2'], []).and_return(expected_results)
   end
 
-  it 'returns args with backup compress, database list and optional_args' do
-    expected_results = '--user="root" --password="12345" --compress --databases="db1 db2" tst_arg_1 tst_arg_2'
-    expect(subject).to run.with_params('root', true, '12345', ['db1', 'db2'], ['tst_arg_1', 'tst_arg_2']).and_return(expected_results)
-  end
-
   it 'returns args without backup compress database list and optional_args' do
     expected_results = '--user="root" --password="12345" --databases="db1 db2" tst_arg_1 tst_arg_2'
     expect(subject).to run.with_params('root', false, '12345', ['db1', 'db2'], ['tst_arg_1', 'tst_arg_2']).and_return(expected_results)