cucumber_analytics 1.5.1 → 1.5.2

data/features/step_definitions/step_steps.rb

@@ -35,7 +35,7 @@ Then /^(?:the )?(?:feature "([^"]*)" )?(?:test(?: "([^"]*)")? )?step(?: "([^"]*)
   expected = nil
   actual = @parsed_files[file - 1].feature.tests[test - 1].steps[step - 1].block
 
-  actual.should == expected
+  expect(actual).to eq(expected)
 end
 
 Then /^(?:the )?(?:feature "([^"]*)" )?test(?: "([^"]*)")? step(?: "([^"]*)")? text is "([^"]*)"$/ do |file, test, step, text|
@@ -87,7 +87,7 @@ Then /^(?:the )?(?:feature "([^"]*)" )?(?:test(?: "([^"]*)")? )?step(?: "([^"]*)
 
   actual = @parsed_files[file - 1].feature.tests[test - 1].steps[step - 1].block.class
 
-  actual.should == expected
+  expect(actual).to eq(expected)
 end
 
 Then /^(?:the )?(?:feature "([^"]*)" )?(?:test(?: "([^"]*)")? )?step(?: "([^"]*)")? source line is "([^"]*)"$/ do |file, test, step, line_number|
@@ -98,7 +98,7 @@ Then /^(?:the )?(?:feature "([^"]*)" )?(?:test(?: "([^"]*)")? )?step(?: "([^"]*)
   expected = line_number.to_i
   actual = @parsed_files[file - 1].feature.tests[test - 1].steps[step - 1].source_line
 
-  actual.should == expected
+  expect(actual).to eq(expected)
 end
 
 Then /^(?:the )?(?:feature "([^"]*)" )?test(?: "([^"]*)")? step(?: "([^"]*)")? correctly stores its underlying implementation$/ do |file, test, step|
@@ -108,7 +108,7 @@ Then /^(?:the )?(?:feature "([^"]*)" )?test(?: "([^"]*)")? step(?: "([^"]*)")? c
 
   raw_element = @parsed_files[file - 1].feature.tests[test - 1].steps[step - 1].raw_element
 
-  raw_element.has_key?('keyword').should be_true
+  expect(raw_element).to have_key('keyword')
 end
 
 Then /^(?:the )?(?:feature "([^"]*)" )?(?:test(?: "([^"]*)")? )?step(?: "([^"]*)")? table row(?: "([^"]*)")? is found to have the following properties:$/ do |file, test, step, row, properties|
@@ -135,7 +135,7 @@ Then /^(?:the )?(?:feature "([^"]*)" )?(?:test(?: "([^"]*)")? )?step(?: "([^"]*)
 
   raw_element = @parsed_files[file - 1].feature.tests[test - 1].steps[step - 1].block.row_elements[row - 1].raw_element
 
-  raw_element.has_key?('cells').should be_true
+  expect(raw_element).to have_key('cells')
 end
 
 Then /^(?:the )?(?:feature "([^"]*)" )?(?:test(?: "([^"]*)")? )?step(?: "([^"]*)")? table row(?: "([^"]*)")? cells are as follows:$/ do |file, test, step, row, cells|
@@ -155,5 +155,5 @@ Given(/^a step element based on the following gherkin:$/) do |step_text|
 end
 
 Then(/^the step has convenient output$/) do
-  @parsed_files.first.feature.tests.first.steps.first.method(:to_s).owner.should == CucumberAnalytics::Step
+  expect(@parsed_files.first.feature.tests.first.steps.first.method(:to_s).owner).to eq(CucumberAnalytics::Step)
 end

data/features/step_definitions/table_steps.rb

@@ -5,9 +5,9 @@ Then /^(?:the )?(?:feature "([^"]*)" )?(?:test(?: "([^"]*)")? )?(?:step(?: "([^"
 
   expected = contents.raw
 
-  @parsed_files[file - 1].feature.tests[test - 1].steps[step - 1].block.row_elements.collect { |row| row.cells }.should == expected
+  expect(@parsed_files[file - 1].feature.tests[test - 1].steps[step - 1].block.row_elements.collect { |row| row.cells }).to eq(expected)
   # todo - remove once #contents is no longer supported
-  @parsed_files[file - 1].feature.tests[test - 1].steps[step - 1].block.contents.should == expected
+  expect(@parsed_files[file - 1].feature.tests[test - 1].steps[step - 1].block.contents).to eq(expected)
 end
 
 Then /^(?:the )?(?:feature "([^"]*)" )?(?:test(?: "([^"]*)")? )?(?:step(?: "([^"]*)") )?table correctly stores its underlying implementation$/ do |file, test, step|
@@ -17,8 +17,8 @@ Then /^(?:the )?(?:feature "([^"]*)" )?(?:test(?: "([^"]*)")? )?(?:step(?: "([^"
 
   raw_element = @parsed_files[file - 1].feature.tests[test - 1].steps[step - 1].block.raw_element
 
-  raw_element.is_a?(Array).should be_true
-  raw_element.each { |row| row.has_key?('cells').should be_true }
+  expect(raw_element).to be_a(Array)
+  raw_element.each { |row| expect(row).to have_key('cells') }
 end
 
 Given(/^a table row element$/) do
@@ -34,7 +34,7 @@ Given(/^a table row element based on the following gherkin:$/) do |row_text|
 end
 
 Then(/^the table row has convenient output$/) do
-  @parsed_files.first.feature.tests.first.steps.first.block.row_elements.first.method(:to_s).owner.should == CucumberAnalytics::TableRow
+  expect(@parsed_files.first.feature.tests.first.steps.first.block.row_elements.first.method(:to_s).owner).to eq(CucumberAnalytics::TableRow)
 end
 
 Given(/^a table element$/) do
@@ -46,7 +46,7 @@ When(/^the table element has no rows$/) do
 end
 
 Then(/^the table has convenient output$/) do
-  @parsed_files.first.feature.tests.first.steps.first.block.method(:to_s).owner.should == CucumberAnalytics::Table
+  expect(@parsed_files.first.feature.tests.first.steps.first.block.method(:to_s).owner).to eq(CucumberAnalytics::Table)
 end
 
 Given(/^a table element based on the following gherkin:$/) do |table_text|

data/features/step_definitions/tag_steps.rb

@@ -1,59 +1,59 @@
 Then /^the feature tag correctly stores its underlying implementation$/ do
   raw_element = @parsed_files.first.feature.tag_elements.first.raw_element
 
-  raw_element.has_key?('name').should be_true
+  expect(raw_element).to have_key('name')
 end
 
 When(/^the test tag correctly stores its underlying implementation$/) do
   raw_element = @parsed_files.first.feature.tests.first.tag_elements.first.raw_element
 
-  raw_element.has_key?('name').should be_true
+  expect(raw_element).to have_key('name')
 end
 
 When(/^the example tag correctly stores its underlying implementation$/) do
   raw_element = @parsed_files.first.feature.tests.first.examples.first.tag_elements.first.raw_element
 
-  raw_element.has_key?('name').should be_true
+  expect(raw_element).to have_key('name')
 end
 
 Then(/^the feature tag name is "([^"]*)"$/) do |tag_name|
   tag = @parsed_files.first.feature.tag_elements.first
 
-  tag.name.should == tag_name
+  expect(tag.name).to eq(tag_name)
 end
 
 When(/^the test tag name is "([^"]*)"$/) do |tag_name|
   tag = @parsed_files.first.feature.tests.first.tag_elements.first
 
-  tag.name.should == tag_name
+  expect(tag.name).to eq(tag_name)
 end
 
 When(/^the example tag name is "([^"]*)"$/) do |tag_name|
   tag = @parsed_files.first.feature.tests.first.examples.first.tag_elements.first
 
-  tag.name.should == tag_name
+  expect(tag.name).to eq(tag_name)
 end
 
 Then(/^the feature tag source line "([^"]*)"$/) do |line|
   tag = @parsed_files.first.feature.tag_elements.first
 
-  tag.source_line.should == line
+  expect(tag.source_line).to eq(line)
 end
 
 When(/^the test tag source line "([^"]*)"$/) do |line|
   tag = @parsed_files.first.feature.tests.first.tag_elements.first
 
-  tag.source_line.should == line
+  expect(tag.source_line).to eq(line)
 end
 
 When(/^the example tag source line "([^"]*)"$/) do |line|
   tag = @parsed_files.first.feature.tests.first.examples.first.tag_elements.first
 
-  tag.source_line.should == line
+  expect(tag.source_line).to eq(line)
 end
 
 Then(/^the tag has convenient output$/) do
-  @parsed_files.first.feature.tag_elements.first.method(:to_s).owner.should == CucumberAnalytics::Tag
+  expect(@parsed_files.first.feature.tag_elements.first.method(:to_s).owner).to eq(CucumberAnalytics::Tag)
 end
 
 Given(/^a tag element based on the following gherkin:$/) do |tag_text|

data/features/step_definitions/test_steps.rb

@@ -16,8 +16,8 @@ Then /^(?:the )?(?:feature "([^"]*)" )?test(?: "([^"]*)")? has the following des
   new_description = @parsed_files[file - 1].feature.tests[test - 1].description_text
   old_description = @parsed_files[file - 1].feature.tests[test - 1].description
 
-  new_description.should == text
-  old_description.should == remove_whitespace(text)
+  expect(new_description).to eq(text)
+  expect(old_description).to eq(remove_whitespace(text))
 end
 
 Then /^(?:the )?(?:feature "([^"]*)" )?test(?: "([^"]*)")? steps are as follows:$/ do |file, test, steps|
@@ -47,8 +47,8 @@ Then /^(?:the )?(?:feature "([^"]*)" )?test(?: "([^"]*)")? is found to have the
 
   expected_tags = expected_tags.raw.flatten
 
-  @parsed_files[file - 1].feature.tests[test - 1].tags.should == expected_tags
-  @parsed_files[file - 1].feature.tests[test - 1].tag_elements.collect { |tag| tag.name }.should == expected_tags
+  expect(@parsed_files[file - 1].feature.tests[test - 1].tags).to eq(expected_tags)
+  expect(@parsed_files[file - 1].feature.tests[test - 1].tag_elements.collect { |tag| tag.name }).to eq(expected_tags)
 end
 
 Then /^(?:the )?(?:feature "([^"]*)" )?test(?: "([^"]*)")? is found to have the following applied tags:$/ do |file, test, expected_tags|
@@ -57,8 +57,8 @@ Then /^(?:the )?(?:feature "([^"]*)" )?test(?: "([^"]*)")? is found to have the
 
   expected_tags = expected_tags.raw.flatten
 
-  @parsed_files[file - 1].feature.tests[test - 1].applied_tags.should == expected_tags
-  @parsed_files[file - 1].feature.tests[test - 1].applied_tag_elements.collect { |tag| tag.name }.should == expected_tags
+  expect(@parsed_files[file - 1].feature.tests[test - 1].applied_tags).to eq(expected_tags)
+  expect(@parsed_files[file - 1].feature.tests[test - 1].applied_tag_elements.collect { |tag| tag.name }).to eq(expected_tags)
 end
 
 Then /^(?:the )?(?:feature "([^"]*)" )?test(?: "([^"]*)")? step "([^"]*)" has the following block:$/ do |file, test, step, block|
@@ -102,11 +102,11 @@ Then /^(?:the )?(?:feature "([^"]*)" )?test(?: "([^"]*)")? correctly stores its
   expected = ['Scenario', 'Scenario Outline']
   actual = raw_element['keyword']
 
-  expected.include?(actual).should be_true
+  expect(expected).to include(actual)
 end
 
 Then(/^the scenario has convenient output$/) do
-  @parsed_files.first.feature.tests.first.method(:to_s).owner.should == CucumberAnalytics::Scenario
+  expect(@parsed_files.first.feature.tests.first.method(:to_s).owner).to eq(CucumberAnalytics::Scenario)
 end
 
 Given(/^a scenario element based on the following gherkin:$/) do |scenario_text|

data/features/step_definitions/verification_steps.rb

@@ -1,9 +1,9 @@
 Then(/^the following text is provided:$/) do |expected_text|
   expected_text.sub!('path_to', @default_file_directory)
 
-  @output.should == expected_text
+  expect(@output).to eq(expected_text)
 end
 
 Then(/^the text provided is "(.*)"$/) do |text_string|
-  @output.should == text_string.gsub('\n', "\n")
+  expect(@output).to eq(text_string.gsub('\n', "\n"))
 end

data/features/step_definitions/world_steps.rb

@@ -2,31 +2,31 @@ Then /^the tags collected from (?:feature "([^"]*)" )?test "([^"]*)" are as foll
   file ||= 1
   expected_tags = expected_tags.raw.flatten
 
-  CucumberAnalytics::World.tags_in(@parsed_files[file - 1].feature.tests[test - 1]).sort.should == expected_tags.sort
-  CucumberAnalytics::World.tag_elements_in(@parsed_files[file - 1].feature.tests[test - 1]).collect { |tag| tag.name }.sort.should == expected_tags.sort
+  expect(CucumberAnalytics::World.tags_in(@parsed_files[file - 1].feature.tests[test - 1]).sort).to eq(expected_tags.sort)
+  expect(CucumberAnalytics::World.tag_elements_in(@parsed_files[file - 1].feature.tests[test - 1]).collect { |tag| tag.name }.sort).to eq(expected_tags.sort)
 end
 
 Then /^the tags collected from feature "([^"]*)" are as follows:$/ do |file, expected_tags|
   file ||= 1
   expected_tags = expected_tags.raw.flatten
 
-  CucumberAnalytics::World.tags_in(@parsed_files[file - 1].feature).sort == expected_tags.sort.should
-  CucumberAnalytics::World.tag_elements_in(@parsed_files[file - 1].feature).collect { |tag| tag.name }.sort.should == expected_tags.sort
+  expect(CucumberAnalytics::World.tags_in(@parsed_files[file - 1].feature).sort).to eq(expected_tags.sort)
+  expect(CucumberAnalytics::World.tag_elements_in(@parsed_files[file - 1].feature).collect { |tag| tag.name }.sort).to eq(expected_tags.sort)
 end
 
 Then /^the tags collected from file "([^"]*)" are as follows:$/ do |file, expected_tags|
   file ||= 1
   expected_tags = expected_tags.raw.flatten
 
-  CucumberAnalytics::World.tags_in(@parsed_files[file - 1]).sort.should == expected_tags.sort
-  CucumberAnalytics::World.tag_elements_in(@parsed_files[file - 1]).collect { |tag| tag.name }.sort.should == expected_tags.sort
+  expect(CucumberAnalytics::World.tags_in(@parsed_files[file - 1]).sort).to eq(expected_tags.sort)
+  expect(CucumberAnalytics::World.tag_elements_in(@parsed_files[file - 1]).collect { |tag| tag.name }.sort).to eq(expected_tags.sort)
 end
 
 Then /^the tags collected from directory are as follows:$/ do |expected_tags|
   expected_tags = expected_tags.raw.flatten
 
-  CucumberAnalytics::World.tags_in(@parsed_directories.last).sort.should == expected_tags.sort
-  CucumberAnalytics::World.tag_elements_in(@parsed_directories.last).collect { |tag| tag.name }.sort.should == expected_tags.sort
+  expect(CucumberAnalytics::World.tags_in(@parsed_directories.last).sort).to eq(expected_tags.sort)
+  expect(CucumberAnalytics::World.tag_elements_in(@parsed_directories.last).collect { |tag| tag.name }.sort).to eq(expected_tags.sort)
 end
 
 Then /^the(?: "([^"]*)")? steps collected from feature "([^"]*)" background are as follows:$/ do |defined, file, steps|

data/lib/cucumber_analytics/step.rb

@@ -67,6 +67,8 @@ module CucumberAnalytics
     # Returns true if the two steps have the same text, minus any keywords
     # and arguments, and false otherwise.
     def ==(other_step)
+      return false unless other_step.respond_to?(:step_text)
+
       left_step = step_text(:with_keywords => false, :with_arguments => false)
       right_step = other_step.step_text(:with_keywords => false, :with_arguments => false)
 
@@ -79,7 +81,7 @@ module CucumberAnalytics
     # exclude certain portions of the text. *left_delimiter* and *right_delimiter*
     # are used to determine which parts of the step are arguments.
     #
-    #  a_step = CucumberAnalytics.new("Given *some* step with a block:\n|block line 1|\n|block line 2|")
+    #  a_step = CucumberAnalytics::Step.new("Given *some* step with a block:\n|block line 1|\n|block line 2|")
     #
     #  a_step.step_text
     #  #=> ['Given *some* step with a block:', '|block line 1|', '|block line 2|']

data/lib/cucumber_analytics/test_element.rb

@@ -23,6 +23,8 @@ module CucumberAnalytics
 
     # Returns true if the two elements have equivalent steps and false otherwise.
     def ==(other_element)
+      return false unless other_element.respond_to?(:steps)
+
       steps == other_element.steps
     end
 

data/lib/cucumber_analytics/version.rb

@@ -1,3 +1,3 @@
 module CucumberAnalytics
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 end

data/spec/integration/background_integration_spec.rb

@@ -12,7 +12,7 @@ describe 'Background, Integration' do
     background = CucumberAnalytics::Background.new(source)
     step = background.steps.first
 
-    step.parent_element.should equal background
+    expect(step.parent_element).to be(background)
   end
 
   context 'getting stuff' do
@@ -35,25 +35,25 @@ describe 'Background, Integration' do
     it 'can get its directory' do
       directory = @background.get_ancestor(:directory)
 
-      directory.should equal @directory
+      expect(directory).to be(@directory)
     end
 
     it 'can get its feature file' do
       feature_file = @background.get_ancestor(:feature_file)
 
-      feature_file.should equal @directory.feature_files.first
+      expect(feature_file).to be(@directory.feature_files.first)
     end
 
     it 'can get its feature' do
       feature = @background.get_ancestor(:feature)
 
-      feature.should equal @directory.feature_files.first.features.first
+      expect(feature).to be(@directory.feature_files.first.features.first)
     end
 
     it 'returns nil if it does not have the requested type of ancestor' do
       example = @background.get_ancestor(:example)
 
-      example.should be_nil
+      expect(example).to be_nil
     end
 
   end

data/spec/integration/directory_integration_spec.rb

@@ -17,8 +17,8 @@ describe 'Directory, Integration' do
     nested_directory = directory.directories.first
     file = directory.feature_files.first
 
-    nested_directory.parent_element.should equal directory
-    file.parent_element.should equal directory
+    expect(nested_directory.parent_element).to be(directory)
+    expect(file.parent_element).to be(directory)
   end
 
   context 'getting stuff' do
@@ -35,13 +35,13 @@ describe 'Directory, Integration' do
     it 'can get its directory' do
       directory = @nested_directory.get_ancestor(:directory)
 
-      directory.should equal @directory
+      expect(directory).to be(@directory)
     end
 
     it 'returns nil if it does not have the requested type of ancestor' do
       example = @nested_directory.get_ancestor(:example)
 
-      example.should be_nil
+      expect(example).to be_nil
     end
 
   end

data/spec/integration/doc_string_integration_spec.rb

@@ -29,37 +29,37 @@ describe 'DocString, Integration' do
     it 'can get its directory' do
       directory = @doc_string.get_ancestor(:directory)
 
-      directory.should equal @directory
+      expect(directory).to be(@directory)
     end
 
     it 'can get its feature file' do
       feature_file = @doc_string.get_ancestor(:feature_file)
 
-      feature_file.should equal @directory.feature_files.first
+      expect(feature_file).to be(@directory.feature_files.first)
     end
 
     it 'can get its feature' do
       feature = @doc_string.get_ancestor(:feature)
 
-      feature.should equal @directory.feature_files.first.features.first
+      expect(feature).to be(@directory.feature_files.first.features.first)
     end
 
     it 'can get its test' do
       test = @doc_string.get_ancestor(:test)
 
-      test.should equal @directory.feature_files.first.features.first.tests.first
+      expect(test).to be(@directory.feature_files.first.features.first.tests.first)
     end
 
     it 'can get its step' do
       step = @doc_string.get_ancestor(:step)
 
-      step.should equal @directory.feature_files.first.features.first.tests.first.steps.first
+      expect(step).to be(@directory.feature_files.first.features.first.tests.first.steps.first)
     end
 
     it 'returns nil if it does not have the requested type of ancestor' do
       example = @doc_string.get_ancestor(:example)
 
-      example.should be_nil
+      expect(example).to be_nil
     end
 
   end

data/spec/integration/example_integration_spec.rb

@@ -15,9 +15,9 @@ describe 'Example, Integration' do
     rows = example.row_elements
     tag = example.tag_elements.first
 
-    rows[0].parent_element.should equal example
-    rows[1].parent_element.should equal example
-    tag.parent_element.should equal example
+    expect(rows[0].parent_element).to be(example)
+    expect(rows[1].parent_element).to be(example)
+    expect(tag.parent_element).to be(example)
   end
 
   context 'getting stuff' do
@@ -42,31 +42,31 @@ describe 'Example, Integration' do
     it 'can get its directory' do
       directory = @example.get_ancestor(:directory)
 
-      directory.should equal @directory
+      expect(directory).to be(@directory)
     end
 
     it 'can get its feature file' do
       feature_file = @example.get_ancestor(:feature_file)
 
-      feature_file.should equal @directory.feature_files.first
+      expect(feature_file).to be(@directory.feature_files.first)
     end
 
     it 'can get its feature' do
       feature = @example.get_ancestor(:feature)
 
-      feature.should equal @directory.feature_files.first.features.first
+      expect(feature).to be(@directory.feature_files.first.features.first)
     end
 
     it 'can get its test' do
       test = @example.get_ancestor(:test)
 
-      test.should equal @directory.feature_files.first.features.first.tests.first
+      expect(test).to be(@directory.feature_files.first.features.first.tests.first)
     end
 
     it 'returns nil if it does not have the requested type of ancestor' do
       example = @example.get_ancestor(:example)
 
-      example.should be_nil
+      expect(example).to be_nil
     end
 
   end