cucumber-formatter 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e476c346672c51f036ddf89abf4632d9d27579a
-  data.tar.gz: 58184c841540ac038ea79602b0a84e0aa27e97c4
+  metadata.gz: c210b68da615b9dee9bd2882a910aef3eda52fec
+  data.tar.gz: 074bc10c433f939741a61a83d5d0002945328e92
 SHA512:
-  metadata.gz: 7af94bb19f29b63edc9cc7ea3a9dd17f217530d26e8bb6ce9518de3f2da52f896a85898db22eb344f30211fc759c4112d15c60632756ee69af72eea12e107bcf
-  data.tar.gz: 5ea75aab1eb0be1d22cadd4f6a66b1ce4170a4cbe6b170ae367666e7ae46263f37a4fe6c1bc70e01a51b24c16e6b79f343c7087d3819a20e12e5f0eee316d04d
+  metadata.gz: 40203ddf676dd86c2c1aa0ced85868009a4102ad849b27fe012b82469dab51726967f5cf2b79e942cf2ad961e022e006f9862b1abea5e755748eba76268238c8
+  data.tar.gz: 2e1c34338c7a09258b3ecbdff2ca06058def7c70dc5d96c71dd28f8c65cfd94935c8bbd8f579517d80ac4b45c8d41bff32536d2fd6120047d53e3bb78687c0d9

data/lib/cucumber_formatter.rb

@@ -34,49 +34,39 @@ class CucumberFormatter
     puts "Initializing CucumberMetrics ...\n\n\n"
   end
 
-  def before_feature_element(scenario)
-    @scenario = scenario
-    @scenario_time_start = Time.now
-
-    @start_time = Time.now
-    @end_time = Time.now
-    machine_name = Socket.gethostname
-
-    @dbm ||= dbm
+  def before_feature(feature)
+    @background = true
+    @scenario_counter ||= 0
 
-    if scenario == nil
-      fail "The scenario did not run"
-    end
-
-    get_scenario_id(scenario)
-    get_environment_id
-    get_browser_id
-
-    # save the test run
-    sql = "INSERT INTO scenario_test_runs (scenario_id, test_run_at, test_environment_id,
-            browser_id, machine_name, created_at, updated_at)
-           VALUES (#{@scenario_id}, now(), #{@env_id}, #{@browser_id}, \'#{machine_name}\', now(), now())"
-    @dbm.query(sql)
-    @str_id = @dbm.last_id
+    @scenario = feature.feature_elements[@scenario_counter]
+    @scenario_counter += 1
+    save_str_start_time
+  end
 
-    # extract and save the tags
-    tags = extract_tags(scenario)
-    tags.each do |t|
-      sql = "INSERT INTO scenario_tags (scenario_test_run_id, tag_name, created_at, updated_at)
-             VALUES (#{@str_id}, \'#{t}\', now(), now())"
-      @dbm.query(sql)
+  # the first set of background steps don't call this method (cucumber 1.3.19) - instead
+  # before_feature is called.
+  def before_feature_element(scenario)
+    unless @background
+      @scenario = scenario
+      save_str_start_time
     end
   end
 
   #save the step
   def after_step(step)
-    step_name = get_step_name(@scenario).strip[0..255].gsub('\'', '')
+    step_name = get_step_name(@scenario)
+    # background steps seem to be adding an extra after_step call. This is above and beyond
+    # the fact that they don't call before_feature_elements until after the background
+    # executes
+    unless step_name == nil
+      step_name = step_name.strip[0..255].gsub('\'', '')
+    end
     @start_time = @end_time
     @end_time = Time.now
 
     sql = "INSERT INTO scenario_steps (scenario_test_run_id, name, elapsed_time, created_at, updated_at)
            VALUES (#{@str_id}, \'#{step_name}\', #{(@end_time - @start_time).round}, now(), now())"
-    @dbm.query sql
+    @dbm.query sql unless step_name == nil
   end
 
   #finish saving the test run
@@ -92,17 +82,63 @@ class CucumberFormatter
     end
     #reset step counter when scenario is finished
     @step_counter = 0
+    # clear the background flag - it seems to only happen once
+    @background = false
   end
 
   private
 
+  def save_str_start_time
+    ###############
+    @scenario_time_start = Time.now
+
+    @start_time = Time.now
+    @end_time = Time.now
+    machine_name = Socket.gethostname
+
+    @dbm ||= dbm
+
+    if @scenario == nil
+      fail "The scenario did not run"
+    end
+
+    get_scenario_id(@scenario)
+    get_environment_id
+    get_browser_id
+
+    save_test_run(machine_name)
+    save_tags
+  end
+
+  def save_tags
+    # extract and save the tags
+    tags = extract_tags
+    tags.each do |t|
+      sql = "INSERT INTO scenario_tags (scenario_test_run_id, tag_name, created_at, updated_at)
+             VALUES (#{@str_id}, \'#{t}\', now(), now())"
+      @dbm.query(sql)
+    end
+  end
+
+  def save_test_run(machine_name)
+    # save the test run
+    sql = "INSERT INTO scenario_test_runs (scenario_id, test_run_at, test_environment_id,
+            browser_id, machine_name, created_at, updated_at)
+           VALUES (#{@scenario_id}, now(), #{@env_id}, #{@browser_id}, \'#{machine_name}\', now(), now())"
+    @dbm.query(sql)
+    @str_id = @dbm.last_id
+  end
+
   # get the step name; keep track of the counter through the scenario
   def get_step_name(scenario)
     @step_counter ||= 0
-    steps = scenario.instance_eval {@steps}
-    step_name = (steps.instance_eval {@steps})[@step_counter]
+    step = scenario.steps.to_a[@step_counter]
     @step_counter += 1
-    return step_name.name
+    if step == nil
+      step
+    else
+      step.name
+    end
   end
 
   def get_scenario_id(scenario)
@@ -185,8 +221,8 @@ class CucumberFormatter
                        :database => database.metrics_db['database'])
   end
 
-  def extract_tags(scenario)
-    scenario.source_tag_names
+  def extract_tags
+    @scenario.source_tag_names
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-formatter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Eric Hartill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2