cucumber_monitor 0.0.7 → 0.0.8

data/lib/cucumber_monitor/base.rb

@@ -32,7 +32,8 @@ module CucumberMonitor
     def step_definitions_files
       collection = []
       dir_entries = Dir.entries(self.class.step_definitions_path)
-      search_and_include_step_definitions(dir_entries)
+      path = self.class.step_definitions_path + "/step_definitions"
+      search_and_include_step_definitions(dir_entries,path)
     end
 
     def search_and_include_features(dir_entries, collection=[])
@@ -44,13 +45,13 @@ module CucumberMonitor
       collection
     end
 
-    def search_and_include_step_definitions(dir_entries, collection=[])
+    def search_and_include_step_definitions(dir_entries, path, collection=[])
       dir_entries.each do |entrie|
         if entrie.include?('_step.rb')
           collection << entrie
         end
       end
-      collection
+      {collection: collection, path: path}
     end
 
     def features
@@ -63,8 +64,9 @@ module CucumberMonitor
 
     def step_definitions
       collection = []
-      step_definitions_files.each do |file|
-        collection << CucumberMonitor::StepDefinitionFile.new(file)  
+      step_definitions_files[:collection].each do |file|
+        path = "#{step_definitions_files[:path]}/#{file}"
+        collection << StepDefinitionFile.new(file,path)  
       end
       collection
     end
@@ -85,11 +87,12 @@ module CucumberMonitor
       results = []
       step_definitions.each do |step_definition|
         step_definition.definitions.each do |definition|
-            matcher = Amatch::Sellers.new(criteria)
-            results << {definition: definition, score: matcher.match(definition.description)}
+          if definition.matcher && criteria.match(definition.matcher)
+            results << definition
+          end
         end
       end
-      results.min {|a,b| a[:score] <=> b[:score]}[:definition] if results.any?
+      results.first if results.any?
     end
 
   end

data/lib/cucumber_monitor/definition.rb

@@ -4,11 +4,16 @@ module CucumberMonitor
 
   class Definition
 
-    attr_accessor :description, :file
+    attr_accessor :description, :file, :line
 
-    def initialize(description, file)
+    def initialize(description, file, line)
       @description = description
       @file = file
+      @line = line
+    end
+
+    def matcher
+      description.scan(/\/(.*)\//).flatten.first
     end
 
     def raw_content
@@ -40,6 +45,14 @@ module CucumberMonitor
       content[1..-2].collect{|c| c.strip }
     end
 
+    def location
+      "#{file.file}:#{line}"
+    end
+
+    def location_path
+      "#{file.path}:#{line}"
+    end
+
   end
 
 end

data/lib/cucumber_monitor/step.rb

@@ -1,5 +1,3 @@
-require 'amatch'
-
 module CucumberMonitor
 
   class Step
@@ -16,7 +14,7 @@ module CucumberMonitor
     end
 
     def description_without_keyword
-      description.gsub(/^\w+\s/,'')
+      description.gsub(/^\S+\s/,'')
     end
 
     def siblings_and_self
@@ -58,7 +56,29 @@ module CucumberMonitor
     end
 
     def definition
-      Base.new.search_match(description)
+      Base.new.search_match(description_without_keyword)
+    end
+
+    def params
+      if implemented? && !table? && !named_params.blank?
+        result = description_without_keyword.match(definition.matcher)
+        data = {}
+        result.size.times do |n|
+          next if n == 0
+          data.merge!(named_params[n-1].to_sym => result[n])
+        end
+        data
+      end
+    end
+
+    def named_params
+      if implemented? && !table?
+        definition.description[/\|(.*)\|/].gsub(/\|/,'').split(",").map{|p| p.strip}
+      end
+    end
+
+    def implemented?
+      !definition.nil?
     end
 
     def formatted

data/lib/cucumber_monitor/step_definition_file.rb

@@ -4,14 +4,15 @@ module CucumberMonitor
 
   class StepDefinitionFile
 
-    attr_accessor :file
+    attr_accessor :file, :path
 
     def self.keywords
       [I18n.t("given"), I18n.t("when"), I18n.t("then"), I18n.t("and"), I18n.t("but")].collect{|c| c[2..-1]}
     end
 
-    def initialize(file)
+    def initialize(file,path)
       @file = file
+      @path = path
     end
 
     def name
@@ -27,9 +28,9 @@ module CucumberMonitor
 
     def definitions
       df = []
-      lines.each do |line|
+      lines.each_with_index do |line,i|
         if self.class.keywords.any?{|k| line.include?(k)}
-          df << Definition.new(line.strip,self)
+          df << Definition.new(line.strip,self,i+1)
         end
       end
       df

data/lib/cucumber_monitor/string.rb

@@ -1,10 +1,6 @@
 # encoding: UTF-8
 
-require 'amatch'
-
 class String
-
-  include Amatch
   
   def clean
     term = self.split(': ')[1]

data/lib/cucumber_monitor/version.rb

@@ -1,3 +1,3 @@
 module CucumberMonitor
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/test/base_test.rb

@@ -28,9 +28,10 @@ class BaseTest < ActiveSupport::TestCase
               'Then I should see "Invalid username/password"',
               'Then I should see my personal information',
               'Then I should see "Personal data successfully changed"',
-              'And I should see "Petter Summers"',
+              'And I should see 1 username for "Petter Summers"',
               'I should see the following table:',
-              'Then I should see "The New York Times - Breaking News, World News & Multimedia"'
+              'Then I should see "The New York Times - Breaking News, World News & Multimedia"',
+              'And I should see 1 occurrence of "New York Times Company"'
             ]
 
     assert_equal steps, @cucumber.search(term).map(&:description)

data/test/definition_test.rb

@@ -0,0 +1,189 @@
+require 'test_helper'
+
+def definition_sample_codes
+  [
+    "User.create(email: email, password: password)",
+    "visit new_user_session_url",
+    "fill_in 'Email', with: email",
+    "fill_in 'Password', with: password",
+    "fill_in('Email', with: email)",
+    "click_button 'Access'",
+    "click_link 'Logout'",
+    "assert_equal new_user_session_url, current_url",
+    "assert_equal user_root_path, current_path",
+    "assert page.has_content?(string)",
+    "sign_in(:user, User.make!)"
+  ]
+end
+
+def has_parentheses?(line)
+  line.scan(/\((.*)\)/).flatten.any?
+end
+
+def first_method_without_parentheses?(line)
+  line.scan(/\w+\s/).any?
+end
+
+def between_parentheses(line)
+  line.scan(/\((.*)\)/).flatten.first
+end
+
+def has_comma?(line)
+  line.scan(/,/).any?
+end
+
+def between_comma(line)
+  line.split(",").map{|o| o.strip}
+end
+
+def has_new_hash_key?(line)
+  line.scan(/\w+:/).any?
+end
+
+def new_hash_keys(line)
+  result = []
+  if line.kind_of?(Array)
+    line.each do |l|
+      result << l.scan(/\w+:/).map{|l| l.strip.gsub(/:/,'')}
+    end
+  else
+    result << line.scan(/\w+:/).map{|l| l.strip.gsub(/:/,'')}
+  end
+  result.flatten
+end
+
+def new_hash_values(line)
+  result = []
+  if line.kind_of?(Array)
+    line.each do |l|
+      result << l.split(/\w+:/).map{|o| o.strip.gsub(/,/,"")}.reject{|s| s.empty?}
+    end
+  else
+    result << line.split(/\w+:/).map{|l| l.strip.gsub(/,/,"")}.reject{|s| s.empty?}
+  end
+  result.flatten
+end
+
+def new_hash_keys_and_values(line)
+  result = {}
+  keys = new_hash_keys(line)
+  values = new_hash_values(line)
+  if keys.size == values.size
+    keys.each_with_index do |k,i|
+      result.merge!({k.to_sym => values[i]})
+    end
+  end
+  result
+end
+
+def inspect_line(line)
+  result = {}
+  if !first_method_without_parentheses?(line) && !has_new_hash_key?(line)
+    
+    lines = line.split(/\((.*)\)/)
+    result.merge!(method: lines[0])
+    rest = between_comma(lines[1..-1].first)
+    rest.each_with_index do |l,i|
+      key_name = "param_#{i+1}"
+      result.merge!({key_name.to_sym => l})
+    end
+  elsif first_method_without_parentheses?(line) && !has_new_hash_key?(line)
+
+    lines = line.split(" ")
+    result.merge!(method: lines[0])
+    result.merge!(param_1: lines[1].gsub(/,/,"")) if lines[1]
+    
+    rest = lines[2..-1].join(" ")
+    if !rest.blank? && !has_comma?(rest) && has_new_hash_key?(rest)
+
+      result.merge!(options: new_hash_keys_and_values(rest))
+    else
+      lines[2..-1].each_with_index do |l,i|
+        key_name = has_new_hash_key?(l) ? :options : "param_#{i+2}"
+
+        if key_name == :options
+          value = new_hash_keys_and_values(l)
+        else
+          value = l
+        end
+        result.merge!({key_name.to_sym => value})
+        end
+    end
+  elsif first_method_without_parentheses?(line) && has_new_hash_key?(line)
+    lines = line.split(" ")
+    result.merge!(method: lines[0])
+    rest = lines[1..-1].join(" ")
+    if new_hash_keys_and_values(rest).blank? && has_comma?(rest)
+      param_data = between_comma(rest)
+      param_data.each_with_index do |p,i|
+        key_name = "param_#{i+1}"
+        value = p
+        if has_new_hash_key?(value)
+          result.merge!(options: new_hash_keys_and_values(value))
+        else
+          result.merge!({key_name.to_sym => value})
+        end
+      end
+    end
+  elsif !first_method_without_parentheses?(line) && has_parentheses?(line)
+
+    lines = line.split(/\((.*)\)/)
+    result.merge!(method: lines[0])
+    within_parentheses = between_parentheses(line)
+    if new_hash_keys_and_values(within_parentheses).blank? && has_comma?(within_parentheses)
+      param_data = between_comma(within_parentheses)
+      param_data.each_with_index do |p,i|
+        key_name = "param_#{i+1}"
+        value = p
+        if has_new_hash_key?(value)
+          result.merge!(options: new_hash_keys_and_values(value))
+        else
+          result.merge!({key_name.to_sym => value})
+        end
+      end
+    elsif !new_hash_keys_and_values(within_parentheses).blank?
+      result.merge!(param_1: new_hash_keys_and_values(within_parentheses))
+    end
+  end
+  result
+end
+
+class DefinitionTest < ActiveSupport::TestCase
+
+  test "should return identify params from code" do
+
+    line_1 = {:method=>"User.create", :param_1=>{:email=>"email", :password=>"password"}}
+    assert_equal line_1, inspect_line(definition_sample_codes[0])
+
+    line_2 = {:method=>"visit", :param_1=>"new_user_session_url"}
+    assert_equal line_2, inspect_line(definition_sample_codes[1])
+
+    line_3 = {:method=>"fill_in", :param_1=>"'Email'", :options=>{:with=>"email"}}
+    assert_equal line_3, inspect_line(definition_sample_codes[2])
+
+    line_4 = {:method=>"fill_in", :param_1=>"'Password'", :options=>{:with=>"password"}}
+    assert_equal line_4, inspect_line(definition_sample_codes[3])
+
+    line_5 = {:method=>"fill_in", :param_1=>"'Email'", :options=>{:with=>"email"}}
+    assert_equal line_5, inspect_line(definition_sample_codes[4])
+    
+    line_6 = {:method=>"click_button", :param_1=>"'Access'"}
+    assert_equal line_6, inspect_line(definition_sample_codes[5])
+
+    line_7 = {:method=>"click_link", :param_1=>"'Logout'"}
+    assert_equal line_7, inspect_line(definition_sample_codes[6])
+
+    line_8 = {:method=>"assert_equal", :param_1=>"new_user_session_url", :param_2=>"current_url"}
+    assert_equal line_8, inspect_line(definition_sample_codes[7])
+
+    line_9 = {:method=>"assert_equal", :param_1=>"user_root_path", :param_2=>"current_path"}
+    assert_equal line_9, inspect_line(definition_sample_codes[8])
+
+    line_10 = {:method=>"assert", :param_1=>"page.has_content?(string)"}
+    assert_equal line_10, inspect_line(definition_sample_codes[9])
+
+    line_11 = {:method=>"sign_in", :param_1=>":user", :param_2=>"User.make!"}
+    assert_equal line_11, inspect_line(definition_sample_codes[10])
+
+  end
+end

data/test/dummy/features/change_my_data.feature

@@ -11,7 +11,7 @@ Feature: Change personal data
     And I fill in "Name" with "Peter Summers"
     And I press "Save"
     Then I should see "Personal data successfully changed"
-    And I should see "Petter Summers"
+    And I should see 1 username for "Petter Summers"
 
   Scenario: Listing my roles
     When I access the system

data/test/dummy/features/google_search.feature

@@ -3,4 +3,5 @@ Feature: Searching on Google
   Scenario: Search for New York Times
     Given I am at the google page
     When I search for "New York Times"
-    Then I should see "The New York Times - Breaking News, World News & Multimedia"
+    Then I should see "The New York Times - Breaking News, World News & Multimedia"
+    And I should see 1 occurrence of "New York Times Company"

data/test/dummy/features/step_definitions/google_search_step.rb

@@ -4,8 +4,13 @@ end
 
 When /^I search for "(.*?)"$/ do |term|
   fill_in 'gbqfq', with: term
+  click_on 'gbqfba'
 end
 
 Then /^I should see "(.*?)"$/ do |string|
-  page.has_content?(string)
+  assert page.has_content?(string)
+end
+
+Then /^I should see (\d+) occurrence of "(.*?)"$/ do |number, string|
+  assert_equal number.to_i, page.all('a', text: string).count
 end

data/test/dummy/log/development.log

@@ -1,48 +0,0 @@
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml