clean up of duplicated code

Author: ollyjshaw

_docker/lib/options.rb

@@ -1,4 +1,5 @@
 class Options
+
   def self.parse(args)
     tasks = {supporting_services: %w(-d)}
 
@@ -20,15 +21,16 @@ def self.parse(args)
       end
 
       opts.on('-t', '--unit-test', 'Run the unit tests') do |b|
-        tasks[:unit_tests] = ['--no-deps', '--rm', 'awestruct', "bundle exec rake test"]
+        tasks[:unit_tests] = unit_test_tasks
         tasks[:decrypt] = true
         tasks[:set_ports] = true
         tasks[:build] = true
       end
 
+
       opts.on('-b', '--build', 'Build the containers') do |b|
         tasks[:decrypt] = true
-        tasks[:unit_tests] = ['--no-deps', '--rm', 'awestruct', "bundle exec rake test"]
+        tasks[:unit_tests] = unit_test_tasks
         tasks[:set_ports] = true
         tasks[:build] = true
       end
@@ -61,37 +63,37 @@ def self.parse(args)
         tasks[:awestruct_command_args] = ["--no-deps", "--rm", "--service-ports", "awestruct", "bundle exec rake create_pr_dirs[docker-pr,build,#{pr}] clean deploy[staging_docker]"]
         tasks[:kill_all] = true
         tasks[:build] = true
-        tasks[:unit_tests] = ['--no-deps', '--rm', 'awestruct', "bundle exec rake test"]
+        tasks[:unit_tests] = unit_test_tasks
         tasks[:set_ports] = true
         tasks[:supporting_services] += %w(elasticsearch mysql searchisko searchiskoconfigure)
       end
 
       opts.on('--acceptance_test_docker', String, 'runs the cucumber features against the local running docker stack.') do
         tasks[:acceptance_test_target_task] = ["--no-deps", "--rm", "--service-ports", "awestruct_acceptance", "bundle exec rake features"]
         tasks[:build] = true
-        tasks[:unit_tests] = ['--no-deps', '--rm', 'awestruct', "bundle exec rake test"]
+        tasks[:unit_tests] = unit_test_tasks
       end
 
       opts.on('--acceptance_test_target HOST_TO_TEST', String, 'runs the cucumber features against the specified HOST_TO_TEST') do |f|
         ENV['HOST_TO_TEST'] = f
         tasks[:acceptance_test_target_task] = ["--no-deps", "--rm", "--service-ports", "awestruct", "bundle exec rake features"]
         tasks[:build] = true
-        tasks[:unit_tests] = ['--no-deps', '--rm', 'awestruct', "bundle exec rake test"]
+        tasks[:unit_tests] = unit_test_tasks
       end
 
       opts.on('--docker-nightly', 'build for PR Staging') do |pr|
         tasks[:awestruct_command_args] = ["--no-deps", "--rm", "--service-ports", "awestruct", "bundle exec rake create_pr_dirs[docker-nightly,build,docker-nightly] clean deploy[staging_docker]"]
         tasks[:kill_all] = true
         tasks[:build] = true
         tasks[:set_ports] = true
-        tasks[:unit_tests] = ['--no-deps', '--rm', 'awestruct', "bundle exec rake test"]
+        tasks[:unit_tests] = unit_test_tasks
         tasks[:supporting_services] += %w(elasticsearch mysql searchisko searchiskoconfigure)
       end
 
       opts.on('--run-the-stack', 'build, restart and preview') do |rts|
         tasks[:decrypt] = true
         tasks[:set_ports] = true
-        tasks[:unit_tests] = ['--no-deps', '--rm', 'awestruct', "bundle exec rake test"]
+        tasks[:unit_tests] = unit_test_tasks
         tasks[:build] = true
         tasks[:kill_all] = true
         tasks[:supporting_services] += %w(elasticsearch mysql searchisko searchiskoconfigure)
@@ -119,5 +121,10 @@ def self.parse(args)
     tasks[:should_start_supporting_services] = tasks[:supporting_services].size > 1
     tasks
   end
+
+  def self.unit_test_tasks
+    ['--no-deps', '--rm', 'awestruct', "bundle exec rake test"]
+  end
+
 end
 

_docker/test/test_options.rb

@@ -32,7 +32,7 @@ def test_decrypt
     def test_set_ports
       tasks = Options.parse (["-b"])
       assert(tasks[:set_ports])
-      assert_equal(tasks[:unit_tests], ['--no-deps', '--rm', 'awestruct', 'bundle exec rake test'])
+      assert_equal(tasks[:unit_tests], expected_unit_test_tasks)
 
       tasks = Options.parse (["-r"])
       assert(tasks[:set_ports])
@@ -81,7 +81,7 @@ def test_acceptance_test_target_task_default_value
       ClimateControl.modify HOST_TO_TEST: nil, AWESTRUCT_HOST_PORT: '32768' do
         tasks = Options.parse (["--acceptance_test_docker"])
         assert(tasks[:build])
-        assert_equal(tasks[:unit_tests], ['--no-deps', '--rm', 'awestruct', 'bundle exec rake test'])
+        assert_equal(tasks[:unit_tests], expected_unit_test_tasks)
         refute(tasks[:set_ports])
         assert_equal(nil, ENV['HOST_TO_TEST'])
         assert_equal(["--no-deps", "--rm", "--service-ports", "awestruct_acceptance", "bundle exec rake features"], tasks[:acceptance_test_target_task])
@@ -91,7 +91,7 @@ def test_acceptance_test_target_task_default_value
     def test_acceptance_test_target_task
       tasks = Options.parse (["--acceptance_test_target=http://example.com"])
       assert(tasks[:build])
-      assert_equal(tasks[:unit_tests], ['--no-deps', '--rm', 'awestruct', 'bundle exec rake test'])
+      assert_equal(tasks[:unit_tests], expected_unit_test_tasks)
       assert_equal('http://example.com', ENV['HOST_TO_TEST'])
       refute(tasks[:set_ports])
       assert_equal(["--no-deps", "--rm", "--service-ports", "awestruct", "bundle exec rake features"], tasks[:acceptance_test_target_task])
@@ -102,7 +102,7 @@ def test_run_docker_nightly
       refute_equal(["--no-deps", "--rm", "--service-ports", "awestruct", "bundle exec rake acceptance_test_target"], tasks[:acceptance_test_target_task])
       assert_equal(["--no-deps", "--rm", "--service-ports", "awestruct", "bundle exec rake create_pr_dirs[docker-nightly,build,docker-nightly] clean deploy[staging_docker]"], tasks[:awestruct_command_args])
       assert(tasks[:kill_all])
-      assert_equal(tasks[:unit_tests], ['--no-deps', '--rm', 'awestruct', 'bundle exec rake test'])
+      assert_equal(tasks[:unit_tests], expected_unit_test_tasks)
       assert(tasks[:set_ports])
       assert(tasks[:build])
       assert_equal(tasks[:supporting_services], %w(-d elasticsearch mysql searchisko searchiskoconfigure))
@@ -112,15 +112,15 @@ def test_run_stage_pr
       tasks = Options.parse (["--stage-pr", "6"])
       assert(tasks[:kill_all])
       assert(tasks[:build])
-      assert_equal(tasks[:unit_tests], ['--no-deps', '--rm', 'awestruct', 'bundle exec rake test'])
+      assert_equal(tasks[:unit_tests], expected_unit_test_tasks)
       assert(tasks[:set_ports])
       assert_equal(tasks[:supporting_services], %w(-d elasticsearch mysql searchisko searchiskoconfigure))
     end
 
     def test_run_the_stack
       tasks = Options.parse (["--run-the-stack"])
       assert(tasks[:kill_all])
-      assert_equal(tasks[:unit_tests], ['--no-deps', '--rm', 'awestruct', 'bundle exec rake test'])
+      assert_equal(tasks[:unit_tests], expected_unit_test_tasks)
       assert_equal(tasks[:supporting_services], %w(-d elasticsearch mysql searchisko searchiskoconfigure))
       assert_equal(['--no-deps', '--rm', '--service-ports', 'awestruct', 'rake git_setup clean preview[docker]'], tasks[:awestruct_command_args])
     end
@@ -130,12 +130,16 @@ def test_test_task
       assert(tasks[:build])
       assert(tasks[:set_ports])
       assert(tasks[:decrypt])
-      assert_equal(tasks[:unit_tests], ['--no-deps', '--rm', 'awestruct', 'bundle exec rake test'])
+      assert_equal(tasks[:unit_tests], expected_unit_test_tasks)
     end
 
     def test_docker_url
       tasks = Options.parse (["-d", "SOMETHING"])
       assert_equal("SOMETHING",tasks[:docker])
     end
+
+    private def expected_unit_test_tasks
+      ['--no-deps', '--rm', 'awestruct', 'bundle exec rake test']
+    end
 end