lib/minke/tasks/cucumber.rb in minke-1.10.0 vs lib/minke/tasks/cucumber.rb in minke-1.11.0

@@ -3,21 +3,25 @@
     class Cucumber < Task
 
       def run args = nil
       	puts "## Running cucumber with tags #{args}"
 
-      	begin
-          status = 0
-      	  @compose.up
+        compose_file = @config.compose_file_for(@task_name)
+        compose_file = File.expand_path(compose_file)
+        compose = @docker_compose_factory.create compose_file unless compose_file == nil
 
-          run_with_block do
-            status = @helper.execute_shell_command "cucumber --color -f pretty #{get_features args}"
+        run_with_block do
+          status = false
+          begin
+            compose.up
+            server_address = @service_discovery.build_address(@task_settings.health_check) 
+            @health_check.wait_for_HTTPOK(server_address) unless @task_settings.health_check == nil
+            
+            status = @shell_helper.execute "cucumber --color -f pretty #{get_features args}"
+          ensure
+            compose.down
+            @error_helper.fatal_error("Cucumber steps failed") unless status == true
           end
-
-      	ensure
-      		@compose.down
-
-          @helper.fatal_error "Cucumber steps failed" unless status == 0
       	end
       end
 
       def get_features args
         if args != nil && args[:feature] != nil