cuporter 0.1.0 → 0.1.1

data/README.textile

@@ -1,6 +1,6 @@
 h1. Cuporter
 
-Scrapes your feature files and shows scenarios per tag, with their context.  Formats Pretty Text, HTML (not styled yet) and CSV.
+Scrapes your feature files and shows scenarios per tag, with their context.  Formats Pretty Text, HTML and CSV.
 
 Consider this a stop-gap until we get this functionality in a proper cucumber formatter.
 
@@ -16,11 +16,20 @@ h3. Example Output
     Scenario: Everybody's Wired
     Scenario Outline: Why is everybody so wired?
       Examples: loosely wired
+        | arg1 | arg2 |
+        | foo  | bar  |
+        | shif | fish |
       Examples: tightly wired
+        | name  | value |
+        | foo   | bar   |
+        | frotz | knurl |
 @ignore
   Feature: Wired
     Scenario Outline: Why is everybody so wired?
       Examples: tightly wired
+        | name  | value |
+        | foo   | bar   |
+        | frotz | knurl |
 @wip
   Feature: HTML formatter
     Scenario: Everything in fixtures/self_test
@@ -35,6 +44,14 @@ h3. Example Output
 
 ---------
 
+h3. Install
+
+<pre>
+  $ gem install cuporter
+</pre>
+
+---------
+
 h3. Command Lines
 
 h4. help

data/Rakefile

@@ -56,7 +56,7 @@ namespace :cuporter do
 
   spec = Gem::Specification.new do |s|
     s.name = 'cuporter'
-    s.version = '0.1.0'
+    s.version = '0.1.1'
     s.rubyforge_project = s.name
 
     s.platform = Gem::Platform::RUBY

data/features/pretty_print.feature

@@ -3,5 +3,5 @@ Feature: Pretty print report on 3 features
   @just_me
   Scenario: Everything in fixtures/self_test
     When I run cuporter --in fixtures/self_test
-    Then the output should have the same contents as "features/reports/pretty_with_outlines.txt"
+    Then the output should have the same contents as "features/reports/pretty_with_outlines_and_examples.txt"
     

data/lib/cuporter/feature_parser.rb

@@ -6,8 +6,9 @@ module Cuporter
     TAG_LINE              = /^\s*(@\w.+)/
     SCENARIO_LINE         = /^\s*(Scenario:[^#]+)$/
     SCENARIO_OUTLINE_LINE = /^\s*(Scenario Outline:[^#]+)$/
-    SCENARIOS_LINE        = /^\s*(Scenarios:[^#]*)$/
-    EXAMPLES_LINE         = /^\s*(Examples:[^#]*)$/
+    SCENARIO_SET_LINE     = /^\s*(Scenarios:[^#]*)$/
+    EXAMPLE_SET_LINE      = /^\s*(Examples:[^#]*)$/
+    EXAMPLE_LINE          = /^\s*(\|.*\|)\s*$/
 
     def initialize
       @current_tags = []
@@ -20,44 +21,52 @@ module Cuporter
     def parse(feature_content)
       lines = feature_content.split(/\n/)
 
-      lines.each do |line|
+      lines.each_with_index do |line, i|
         case line
         when TAG_LINE
           # may be more than one tag line
           @current_tags |= $1.strip.split(/\s+/)
         when FEATURE_LINE
-          @feature = TagListNode.new($1.strip, @current_tags)
+          @feature = TagListNode.new($1, @current_tags)
           @current_tags = []
         when SCENARIO_LINE
           # How do we know when we have read all the lines from a "Scenario Outline:"?
           # One way is when we encounter a "Scenario:"
-          if @scenario_outline
-            @feature.merge(@scenario_outline)
-            @scenario_outline = nil
-          end
+          close_scenario_outline
 
-          @feature.add_to_tag_node(Node.new($1.strip), @current_tags)
+          @feature.add_to_tag_nodes(TagListNode.new($1, @current_tags))
           @current_tags = []
         when SCENARIO_OUTLINE_LINE
           # ... another is when we hit a subsequent "Scenario Outline:"
-          if @scenario_outline
-            @feature.merge(@scenario_outline)
-            @scenario_outline = nil
-          end
+          close_scenario_outline
 
-          @scenario_outline  = TagListNode.new($1.strip, @current_tags)
+          @scenario_outline  = TagListNode.new($1, @current_tags)
           @current_tags = []
-        when EXAMPLES_LINE, SCENARIOS_LINE
-          @scenario_outline.add_to_tag_node(Node.new($1.strip), @feature.universal_tags | @current_tags)
+        when EXAMPLE_SET_LINE, SCENARIO_SET_LINE
+          @scenario_outline.add_to_tag_nodes(@example_set) if @example_set
+
+          @example_set = NonSortingNode.new($1, @feature.tags | @current_tags)
           @current_tags = []
+        when EXAMPLE_LINE
+          @example_set.add_child(Node.new($1))
         end
       end
 
       # EOF is the final way that we know we are finished with a "Scenario Outline"
-      @feature.merge(@scenario_outline) if @scenario_outline
+      close_scenario_outline
       return @feature
     end
 
+    def close_scenario_outline
+      if @scenario_outline
+        if @example_set
+          @scenario_outline.add_to_tag_nodes(@example_set) if @example_set
+          @example_set = nil
+        end
+        @feature.merge(@scenario_outline)
+        @scenario_outline = nil
+      end
+    end
   end
 
 end

data/lib/cuporter/formatters/html.rb

@@ -7,10 +7,10 @@ module Cuporter
   module Formatters
     class Html < Writer
 
-      NODE_CLASS = [:tag, :feature, :scenario, :example]
+      NODE_CLASS = [:tag, :feature, :scenario, :example_set]
 
       def write_nodes
-        @report.children.sort.each do |tag_node|
+        @report.sort.children.each do |tag_node|
           write_node(tag_node, 0)
         end
         builder
@@ -21,15 +21,15 @@ module Cuporter
       end
 
       def write_node(node, indent_level)
-        builder.li do |list_item|
-          list_item.span(node.name, :class => NODE_CLASS[indent_level])
+        builder.li(:class => NODE_CLASS[indent_level]) do |list_item|
+          list_item.span(node.name, :class => "#{NODE_CLASS[indent_level]}_name")
           if node.has_children?
-            list_item.ul do |list|
-              node.children.sort.each do |child|
+            list_item.ul(:class => "#{NODE_CLASS[indent_level]}_children") do |list|
+              node.sort.children.each do |child|
                 if child.has_children?
                   write_node(child, indent_level + 1)
                 else
-                  list.li(child.name, :class => NODE_CLASS[indent_level + 1])
+                  list.li(child.name, :class => "#{NODE_CLASS[indent_level + 1]}_name")
                 end
               end
             end
@@ -37,6 +37,10 @@ module Cuporter
         end
       end
 
+      def inline_style
+        File.read("lib/cuporter/formatters/cuporter.css")
+      end
+
       def get_binding
         binding
       end
@@ -54,10 +58,12 @@ module Cuporter
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <title>Cucumber Tags</title>
-    <style type="text/css"></style>
+    <style type="text/css">
+      <%= inline_style%>
+    </style>
 </head>
 <body>
-    <ul>
+    <ul class="tag_list">
       <%= write_nodes%>
     </ul>
 </body>

data/lib/cuporter/formatters/text_methods.rb

@@ -4,16 +4,16 @@ module Cuporter
     module TextMethods
     
       def write
-        @report.children.sort.each do |tag_node|
+        @report.sort.children.each do |tag_node|
           write_node(tag_node, 0)
         end
       end
 
       def write_node(node, tab_stops)
         @output.puts "#{self.class::TAB * tab_stops}#{node.name}"
-        node.children.sort.each do |child|
+        node.sort.children.each do |child|
           @output.puts "#{self.class::TAB + (self.class::TAB * tab_stops)}#{child.name}"
-          child.children.sort.each do |grand_child|
+          child.sort.children.each do |grand_child|
             if grand_child.has_children?
               write_node(grand_child, tab_stops + 2)
             else

data/lib/cuporter/node.rb

@@ -6,7 +6,7 @@ module Cuporter
     attr_reader :name, :children
 
     def initialize(name)
-      @name = name
+      @name = name.strip
       @children = []
     end
 
@@ -42,6 +42,11 @@ module Cuporter
       @name_without_title ||= name.split(/:\s+/).last
     end
 
+    def sort
+      children.sort!
+      self
+    end
+
     # sort on name or substring of name after any ':'
     def <=>(other)
       name_without_title <=> other.name_without_title

data/lib/cuporter/non_sorting_node.rb

@@ -0,0 +1,16 @@
+# Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
+module Cuporter
+  class NonSortingNode < Node
+    attr_reader :tags
+
+    def initialize(name, tags)
+      super(name)
+      @tags = tags
+    end
+
+    def sort
+      self
+    end
+
+  end
+end

data/lib/cuporter/tag_list_node.rb

@@ -1,21 +1,21 @@
 # Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
 module Cuporter
-  # a node with a list of tags that apply to all children
+  # a node with a list of tags that can be applied to all children
   class TagListNode < Node
 
-    attr_reader :universal_tags
+    attr_reader :tags
 
-    def initialize(name, universal_tags)
+    def initialize(name, tags)
       super(name)
-      @universal_tags = universal_tags
+      @tags = tags
     end
 
-    def has_universal_tags?
-      @universal_tags.size > 0
+    def has_tags?
+      @tags.size > 0
     end
 
-    def add_to_tag_node(node, childs_tags = [])
-      (universal_tags | childs_tags).each do |tag|
+    def add_to_tag_nodes(node)
+      (tags | node.tags).each do |tag|
         tag_node = find_or_create_child(tag)
         tag_node.add_child(node)
       end

data/lib/cuporter.rb

@@ -1,6 +1,7 @@
 # Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
 require 'cuporter/node'
 require 'cuporter/tag_list_node'
+require 'cuporter/non_sorting_node'
 require 'cuporter/feature_parser'
 require 'cuporter/extensions/string'
 require 'cuporter/cli/options'

data/spec/cuporter/feature_parser_spec.rb

@@ -2,30 +2,30 @@ require 'spec_helper'
 
 module Cuporter
   describe FeatureParser do
-    context "#universal_tags" do
+    context "#tags" do
       context "one tag" do
         it "returns one tag" do
           feature = FeatureParser.parse("@wip\nFeature: foo")
-          feature.universal_tags.should == ["@wip"]
+          feature.tags.should == ["@wip"]
         end
       end
 
       context "two tags on one line" do
         it "returns two tags" do
           feature = FeatureParser.parse(" \n@smoke @wip\nFeature: foo")
-          feature.universal_tags.sort.should == %w[@smoke @wip].sort
+          feature.tags.sort.should == %w[@smoke @wip].sort
         end
       end
       context "two tags on two lines" do
         it "returns two tags" do
           feature = FeatureParser.parse(" \n@smoke\n @wip\nFeature: foo")
-          feature.universal_tags.sort.should == %w[@smoke @wip].sort
+          feature.tags.sort.should == %w[@smoke @wip].sort
         end
       end
       context "no tags" do
         it "returns no tags" do
           feature = FeatureParser.parse("\nFeature: foo")
-          feature.universal_tags.should == []
+          feature.tags.should == []
         end
       end
 

data/spec/cuporter/functional/scenario_outlines_spec.rb

@@ -0,0 +1,431 @@
+require 'spec_helper'
+
+module Cuporter
+
+  describe "Tag Reports of Scenario Outlines in Single Features" do
+
+    context "scenario outline with 2 examples" do
+      context "1 example tag" do
+        it "returns 1 tag mapped to 1 example" do
+          report = one_feature( "fixtures/scenario_outline_with_2_examples/1_example_tag.feature")
+          report.should  == <<EOF
+@smoke
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: bang
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+EOF
+        end
+      end
+
+      context "1 tag per example" do
+        it "returns 2 examples mapped to a tag" do
+          report = one_feature( "fixtures/scenario_outline_with_2_examples/1_tag_per_example.feature")
+          report.should  == <<EOF
+@smoke
+  Feature: foo
+    Scenario Outline: some
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@wip
+  Feature: foo
+    Scenario Outline: some
+      Scenarios: another
+        |foo|bar|fan|
+        | 7 | 8 | 9 |
+        | 0 | 1 | 2 |
+EOF
+        end
+      end
+
+      context "1 tag per example, 2 feature tags" do
+        it "returns 4 tags . . ." do
+          report = one_feature( "fixtures/scenario_outline_with_2_examples/1_tag_per_example_2_feature_tags.feature")
+          report.should  == <<EOF
+@smoke
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@taggy
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@waggy
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@wip
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+EOF
+        end
+      end
+
+      context "1 example tag and 1 feature tag" do
+        it "returns 2 tags" do
+          report = one_feature( "fixtures/scenario_outline_with_2_examples/1_example_tag_and_1_feature_tag.feature")
+          report.should  == <<EOF
+@f_tag
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@smoke
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+EOF
+        end
+      end
+
+      context "1 example tag and 1 scenario outline tag" do
+        it "returns 1 example mapped to 1 tag" do
+          report = one_feature( "fixtures/scenario_outline_with_2_examples/1_example_tag_and_1_scenario_outline_tag.feature")
+          report.should  == <<EOF
+@s_o_tag
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@smoke
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+EOF
+        end
+      end
+      context "1 example tag, 1 scenario outline tag, 1 feature tag" do
+        it "3 tags" do
+          report = one_feature( "fixtures/scenario_outline_with_2_examples/1_example_tag_1_scenario_outline_tag_1_feature_tag.feature")
+          report.should  == <<EOF
+@f_tag
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@s_o_tag
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@smoke
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+EOF
+        end
+      end
+    end
+
+    context "1 scenario and 1 outline with 2 examples" do
+      context "1 scenario tag, 1 outline tag" do
+        it "returns 2 tags, 1 with a scenario, 1 with an outline" do
+          report = one_feature( "fixtures/1_scenario_and_1_outline_with_2_examples/1_scenario_tag_1_outline_tag.feature")
+          report.should  == <<EOF
+@s_o_tag
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@s_tag
+  Feature: foo
+    Scenario: oh
+EOF
+        end
+      end
+
+      context "1 scenario tag, 1 example tag" do
+        it "returns 2 tags, 1 with a scenario and 1 with an outline" do
+          report = one_feature( "fixtures/1_scenario_and_1_outline_with_2_examples/1_scenario_tag_1_example_tag.feature")
+          report.should  == <<EOF
+@s_o_tag
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@s_tag
+  Feature: foo
+    Scenario: oh
+EOF
+        end
+      end
+
+      context "1 feature tag, 1 example tag" do
+        it "returns 2 tags" do
+          report = one_feature( "fixtures/1_scenario_and_1_outline_with_2_examples/1_feature_tag_1_example_tag.feature")
+          report.should  == <<EOF
+@example_tag
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@f_tag
+  Feature: foo
+    Scenario: oh
+    Scenario Outline: outline
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+EOF
+
+        end
+      end
+
+      context "1 feature tag, 2 scenario tags, 1 outline tag, 1 example tag" do
+        it "returns 5 tags" do
+          report = one_feature( "fixtures/1_scenario_and_1_outline_with_2_examples/1_feature_tag_2_scenario_tags_1_outline_tag_1_example_tag.feature")
+          report.should  == <<EOF
+@e_tag
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@f_tag
+  Feature: foo
+    Scenario: oh
+    Scenario Outline: outline
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@o_tag
+  Feature: foo
+    Scenario Outline: outline
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@s_tag
+  Feature: foo
+    Scenario: oh
+@wip
+  Feature: foo
+    Scenario: oh
+EOF
+        end
+      end
+
+    end
+
+    context "2 outlines 1 scenario" do
+      context "2 outline tags, 1 scenario tag, 1 example tag" do
+        it "returns 4 tags" do
+          report = one_feature( "fixtures/2_outlines_1_scenario/2_outline_tags_1_scenario_tag_1_example_tag.feature")
+          report.should  == <<EOF
+@e_tag
+  Feature: foo
+    Scenario Outline: outline 2
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@s_o_tag_1
+  Feature: foo
+    Scenario Outline: outline 1
+      Scenarios: example
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@s_o_tag_2
+  Feature: foo
+    Scenario Outline: outline 2
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@wip
+  Feature: foo
+    Scenario: oh
+EOF
+        end
+      end
+
+      context "2 outline tags, 2 example tags, 2 empty example names" do
+        it "returns 4 tags" do
+          report = one_feature( "fixtures/2_outlines_1_scenario/empty_example_name.feature")
+          report.should  == <<EOF
+@e_tag
+  Feature: foo
+    Scenario Outline: outline 2
+      Examples:
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@nameless
+  Feature: foo
+    Scenario Outline: outline 1
+      Scenarios:
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@s_o_tag_1
+  Feature: foo
+    Scenario Outline: outline 1
+      Scenarios:
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Scenarios: example set 2
+        |foo|bar|fan|
+        | 5 | 6 | 7 |
+        | 8 | 9 | 0 |
+@s_o_tag_2
+  Feature: foo
+    Scenario Outline: outline 2
+      Examples:
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Examples: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+EOF
+        end
+      end
+    end
+
+    context "scenario outlines only" do
+      context "3 outlines" do
+        it "includes all outlines" do
+          report = one_feature( "fixtures/3_scenario_outlines.feature")
+          report.should  == <<EOF
+@blocked
+  Feature: foo
+    Scenario Outline: outline 2
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@e_tag
+  Feature: foo
+    Scenario Outline: outline 3
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@s_o_tag_1
+  Feature: foo
+    Scenario Outline: outline 1
+      Scenarios: example
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@s_o_tag_3
+  Feature: foo
+    Scenario Outline: outline 3
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+@wip
+  Feature: foo
+    Scenario Outline: outline 2
+      Scenarios: another
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+      Scenarios: yet
+        |foo|bar|fan|
+        | 1 | 2 | 3 |
+        | 4 | 5 | 6 |
+EOF
+        end
+      end
+
+    end
+
+  end
+end
+

data/spec/cuporter/functional/single_feature_spec.rb

@@ -49,300 +49,6 @@ EOF
       end
     end
 
-    context "one scenario tag one feature tag" do
-      it "returns two tags, one mapped to one scenario, the other mapped to two" do
-          report = one_feature( "fixtures/one_scenario_tag_one_feature_tag.feature")
-          report.should  == <<EOF
-@customer_module
-  Feature: foo
-    Scenario: another test
-    Scenario: some test of something
-@smoke
-  Feature: foo
-    Scenario: another test
-EOF
-      end
-    end
-
-
-    context "scenario outline with 2 examples" do
-      context "1 example tag" do
-        it "returns 1 tag mapped to 1 example" do
-          report = one_feature( "fixtures/scenario_outline_with_2_examples/1_example_tag.feature")
-          report.should  == <<EOF
-@smoke
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: bang
-EOF
-        end
-      end
-
-      context "1 tag per example" do
-        it "returns 2 examples mapped to a tag" do
-          report = one_feature( "fixtures/scenario_outline_with_2_examples/1_tag_per_example.feature")
-          report.should  == <<EOF
-@smoke
-  Feature: foo
-    Scenario Outline: some
-      Scenarios: yet
-@wip
-  Feature: foo
-    Scenario Outline: some
-      Scenarios: another
-EOF
-        end
-      end
-
-      context "1 tag per example, 2 feature tags" do
-        it "returns 4 tags . . ." do
-          report = one_feature( "fixtures/scenario_outline_with_2_examples/1_tag_per_example_2_feature_tags.feature")
-          report.should  == <<EOF
-@smoke
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: yet
-@taggy
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: another
-      Scenarios: yet
-@waggy
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: another
-      Scenarios: yet
-@wip
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: another
-EOF
-        end
-      end
-
-      context "1 example tag and 1 feature tag" do
-        it "returns 2 tags" do
-          report = one_feature( "fixtures/scenario_outline_with_2_examples/1_example_tag_and_1_feature_tag.feature")
-          report.should  == <<EOF
-@f_tag
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: another
-      Scenarios: yet
-@smoke
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: yet
-EOF
-        end
-      end
-
-      context "1 example tag and 1 scenario outline tag" do
-        it "returns 1 example mapped to 1 tag" do
-          report = one_feature( "fixtures/scenario_outline_with_2_examples/1_example_tag_and_1_scenario_outline_tag.feature")
-          report.should  == <<EOF
-@s_o_tag
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: another
-      Scenarios: yet
-@smoke
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: yet
-EOF
-        end
-      end
-      context "1 example tag, 1 scenario outline tag, 1 feature tag" do
-        it "3 tags" do
-          report = one_feature( "fixtures/scenario_outline_with_2_examples/1_example_tag_1_scenario_outline_tag_1_feature_tag.feature")
-          report.should  == <<EOF
-@f_tag
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: another
-      Scenarios: yet
-@s_o_tag
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: another
-      Scenarios: yet
-@smoke
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: yet
-EOF
-        end
-      end
-    end
-
-    context "1 scenario and 1 outline with 2 examples" do
-      context "1 scenario tag, 1 outline tag" do
-        it "returns 2 tags, 1 with a scenario, 1 with an outline" do
-          report = one_feature( "fixtures/1_scenario_and_1_outline_with_2_examples/1_scenario_tag_1_outline_tag.feature")
-          report.should  == <<EOF
-@s_o_tag
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: another
-      Scenarios: yet
-@s_tag
-  Feature: foo
-    Scenario: oh
-EOF
-        end
-      end
-
-      context "1 scenario tag, 1 example tag" do
-        it "returns 2 tags, 1 with a scenario and 1 with an outline" do
-          report = one_feature( "fixtures/1_scenario_and_1_outline_with_2_examples/1_scenario_tag_1_example_tag.feature")
-          report.should  == <<EOF
-@s_o_tag
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: another
-@s_tag
-  Feature: foo
-    Scenario: oh
-EOF
-        end
-      end
-
-      context "1 feature tag, 1 example tag" do
-        it "returns 2 tags" do
-          report = one_feature( "fixtures/1_scenario_and_1_outline_with_2_examples/1_feature_tag_1_example_tag.feature")
-          report.should  == <<EOF
-@example_tag
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: another
-@f_tag
-  Feature: foo
-    Scenario: oh
-    Scenario Outline: outline
-      Scenarios: another
-      Scenarios: yet
-EOF
-
-        end
-      end
-
-      context "1 feature tag, 2 scenario tags, 1 outline tag, 1 example tag" do
-        it "returns 5 tags" do
-          report = one_feature( "fixtures/1_scenario_and_1_outline_with_2_examples/1_feature_tag_2_scenario_tags_1_outline_tag_1_example_tag.feature")
-          report.should  == <<EOF
-@e_tag
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: yet
-@f_tag
-  Feature: foo
-    Scenario: oh
-    Scenario Outline: outline
-      Scenarios: another
-      Scenarios: yet
-@o_tag
-  Feature: foo
-    Scenario Outline: outline
-      Scenarios: another
-      Scenarios: yet
-@s_tag
-  Feature: foo
-    Scenario: oh
-@wip
-  Feature: foo
-    Scenario: oh
-EOF
-        end
-      end
-
-    end
-
-    context "2 outlines 1 scenario" do
-      context "2 outline tags, 1 scenario tag, 1 example tag" do
-        it "returns 4 tags" do
-          report = one_feature( "fixtures/2_outlines_1_scenario/2_outline_tags_1_scenario_tag_1_example_tag.feature")
-          report.should  == <<EOF
-@e_tag
-  Feature: foo
-    Scenario Outline: outline 2
-      Scenarios: yet
-@s_o_tag_1
-  Feature: foo
-    Scenario Outline: outline 1
-      Scenarios: example
-@s_o_tag_2
-  Feature: foo
-    Scenario Outline: outline 2
-      Scenarios: another
-      Scenarios: yet
-@wip
-  Feature: foo
-    Scenario: oh
-EOF
-        end
-      end
-
-      context "2 outline tags, 2 example tag, 2 empty example names" do
-        it "returns 4 tags" do
-          report = one_feature( "fixtures/2_outlines_1_scenario/empty_example_name.feature")
-          report.should  == <<EOF
-@e_tag
-  Feature: foo
-    Scenario Outline: outline 2
-      Examples:
-@nameless
-  Feature: foo
-    Scenario Outline: outline 1
-      Scenarios:
-@s_o_tag_1
-  Feature: foo
-    Scenario Outline: outline 1
-      Scenarios:
-      Scenarios: example set 2
-@s_o_tag_2
-  Feature: foo
-    Scenario Outline: outline 2
-      Examples:
-      Examples: another
-EOF
-        end
-      end
-    end
-
-    context "scenario outlines only" do
-      context "3 outlines" do
-        it "includes all outlines" do
-          report = one_feature( "fixtures/3_scenario_outlines.feature")
-          report.should  == <<EOF
-@blocked
-  Feature: foo
-    Scenario Outline: outline 2
-      Scenarios: another
-@e_tag
-  Feature: foo
-    Scenario Outline: outline 3
-      Scenarios: yet
-@s_o_tag_1
-  Feature: foo
-    Scenario Outline: outline 1
-      Scenarios: example
-@s_o_tag_3
-  Feature: foo
-    Scenario Outline: outline 3
-      Scenarios: another
-      Scenarios: yet
-@wip
-  Feature: foo
-    Scenario Outline: outline 2
-      Scenarios: another
-      Scenarios: yet
-EOF
-        end
-      end
-
-    end
-
   end
 end
 

data/spec/cuporter/tag_list_node_spec.rb

@@ -9,12 +9,12 @@ module Cuporter
       end
       
       it 'has an empty tag list' do
-        tag_list_node.should_not have_universal_tags
+        tag_list_node.should_not have_tags
       end
       context 'with tags' do
         it 'should have tags' do
           tag_list_node = TagListNode.new("name", %w[tag_1 tag_2])
-          tag_list_node.should have_universal_tags
+          tag_list_node.should have_tags
         end
       end
     end
@@ -23,7 +23,7 @@ module Cuporter
       context 'with universal tags but none of their own' do
         it 'child inherits one tag from parent' do
           tag_list_node = TagListNode.new("parent", ["p_tag_1"])
-          tag_list_node.add_to_tag_node(Node.new("child"))
+          tag_list_node.add_to_tag_nodes(TagListNode.new("child", []))
 
           tag_list_node.children.size.should == 1
           tag_list_node.children.first.name.should == "p_tag_1"
@@ -34,7 +34,7 @@ module Cuporter
         end
         it 'child inherits 2 tags from parent' do
           tag_list_node = TagListNode.new("parent", ["p_tag_1", "p_tag_2"])
-          tag_list_node.add_to_tag_node(Node.new("child"))
+          tag_list_node.add_to_tag_nodes(TagListNode.new("child", []))
 
           tag_list_node.children.size.should == 2
           tag_list_node.children.first.name.should == "p_tag_1"
@@ -51,7 +51,7 @@ module Cuporter
       context 'without universal tags but some of their own' do
         let(:tag_list_node) {TagListNode.new("parent", []) }
         it 'child has one tag' do
-          tag_list_node.add_to_tag_node(Node.new("child"), ["c_tag_1"])
+          tag_list_node.add_to_tag_nodes(TagListNode.new("child", ["c_tag_1"]))
 
           tag_list_node.children.size.should == 1
           tag_list_node.children.first.name.should == "c_tag_1"
@@ -60,7 +60,7 @@ module Cuporter
           tag_list_node[:c_tag_1].children.first.name.should == "child"
         end
         it 'child has two tags' do
-          tag_list_node.add_to_tag_node(Node.new("child"), ["c_tag_1", "c_tag_2"])
+          tag_list_node.add_to_tag_nodes(TagListNode.new("child", ["c_tag_1", "c_tag_2"]))
 
           tag_list_node.children.size.should == 2
           tag_list_node.children.first.name.should == "c_tag_1"
@@ -76,7 +76,7 @@ module Cuporter
       context 'with universal tags and their own tags' do
         let(:tag_list_node) {TagListNode.new("parent",%w[p_tag_1 p_tag_2]) }
         it "2 universal tags and 2 child tags" do
-          tag_list_node.add_to_tag_node(Node.new("child"), ["c_tag_1", "c_tag_2"])
+          tag_list_node.add_to_tag_nodes(TagListNode.new("child", ["c_tag_1", "c_tag_2"]))
 
           tag_list_node.children.size.should == 4
           tag_list_node.children.collect do |c|
@@ -99,7 +99,7 @@ module Cuporter
       context 'with no tags at all' do
         it 'top node has no children' do
           tag_list_node = TagListNode.new("parent", [])
-          tag_list_node.add_to_tag_node(Node.new("child"))
+          tag_list_node.add_to_tag_nodes(TagListNode.new("child", []))
           
           tag_list_node.should_not have_children
 
@@ -110,8 +110,8 @@ module Cuporter
       context 'second child with preexisting tag' do
         it 'top node has 1 child and 2 grandchildren' do
           tag_list_node = TagListNode.new("parent", ["p_tag_1"])
-          tag_list_node.add_to_tag_node(Node.new("child_1"))
-          tag_list_node.add_to_tag_node(Node.new("child_2"))
+          tag_list_node.add_to_tag_nodes(TagListNode.new("child_1", []))
+          tag_list_node.add_to_tag_nodes(TagListNode.new("child_2", []))
 
           tag_list_node.children.size.should == 1
           tag_list_node.children[0].name.should == "p_tag_1"
@@ -123,8 +123,8 @@ module Cuporter
 
         it '2 child nodes with 1 universal tag and 2 child tags' do
           tag_list_node = TagListNode.new("parent", ["p_tag_1"])
-          tag_list_node.add_to_tag_node(Node.new("child_1"), ["c_tag_1"])
-          tag_list_node.add_to_tag_node(Node.new("child_2"), ["c_tag_1", "c_tag_2"])
+          tag_list_node.add_to_tag_nodes(TagListNode.new("child_1", ["c_tag_1"]))
+          tag_list_node.add_to_tag_nodes(TagListNode.new("child_2", ["c_tag_1", "c_tag_2"]))
 
           tag_list_node.children.size.should == 3
           tag_list_node.children[0].name.should == "p_tag_1"
@@ -150,16 +150,16 @@ module Cuporter
             it 'top node has no children' do
               p = TagListNode.new("parent", ["p_tag_1"])
               c = TagListNode.new("child", [] )
-              c.add_to_tag_node(Node.new("leaf_1"))
+              c.add_to_tag_nodes(TagListNode.new("leaf_1", []))
 
               p.should_not have_children
             end
 
             it 'all leaf nodes are under parent universal tag' do
               p = TagListNode.new("parent", ["p_tag_1"])
-              c = TagListNode.new("child", p.universal_tags)
-              c.add_to_tag_node(Node.new("leaf_1"))
-              c.add_to_tag_node(Node.new("leaf_2"))
+              c = TagListNode.new("child", p.tags)
+              c.add_to_tag_nodes(TagListNode.new("leaf_1", []))
+              c.add_to_tag_nodes(TagListNode.new("leaf_2", []))
               p.merge(c)
 
               p.children.size.should == 1
@@ -181,9 +181,9 @@ module Cuporter
         context '1 universal tag on parent and 1 universal tag on child' do
           it "2 tags have 2 leaf nodes" do
             p = TagListNode.new("parent", ["p_tag_1"])
-            c = TagListNode.new("child", p.universal_tags | ["c_tag_1"])
-            c.add_to_tag_node(Node.new("leaf_1"))
-            c.add_to_tag_node(Node.new("leaf_2"))
+            c = TagListNode.new("child", p.tags | ["c_tag_1"])
+            c.add_to_tag_nodes(TagListNode.new("leaf_1", []))
+            c.add_to_tag_nodes(TagListNode.new("leaf_2", []))
             p.merge(c)
 
             p.children.size.should == 2
@@ -213,9 +213,9 @@ module Cuporter
         context '1 universal tag on parent and 1 tag on 1 leaf' do
           it "1 tag has 1 leaf node, the other has 2 leaf nodes" do
             p = TagListNode.new("parent", ["p_tag_1"])
-            c = TagListNode.new("child", p.universal_tags )
-            c.add_to_tag_node(Node.new("leaf_1"))
-            c.add_to_tag_node(Node.new("leaf_2"), ["l_tag_1"])
+            c = TagListNode.new("child", p.tags )
+            c.add_to_tag_nodes(TagListNode.new("leaf_1", []))
+            c.add_to_tag_nodes(TagListNode.new("leaf_2", ["l_tag_1"]))
             p.merge(c)
 
             p.children.size.should == 2
@@ -243,9 +243,9 @@ module Cuporter
         context '1 universal tag on parent 1 universal tag on child 1 tag on leaf' do
           it "2 tags with 2 leaves, 1 tag with 1 leaf" do
             p = TagListNode.new("parent", ["p_tag_1"])
-            c = TagListNode.new("child", p.universal_tags | ["c_tag_1"])
-            c.add_to_tag_node(Node.new("leaf_1"))
-            c.add_to_tag_node(Node.new("leaf_2"), ["l_tag_1"])
+            c = TagListNode.new("child", p.tags | ["c_tag_1"])
+            c.add_to_tag_nodes(TagListNode.new("leaf_1", []))
+            c.add_to_tag_nodes(TagListNode.new("leaf_2", ["l_tag_1"]))
             p.merge(c)
 
             p.children.size.should == 3

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tim Camper
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 -05:00
+date: 2010-09-05 00:00:00 -05:00
 default_executable: cuporter
 dependencies: []
 
@@ -31,6 +31,7 @@ files:
 - LICENSE
 - README.textile
 - Rakefile
+- lib/cuporter/non_sorting_node.rb
 - lib/cuporter/formatters/csv.rb
 - lib/cuporter/formatters/text.rb
 - lib/cuporter/formatters/html.rb
@@ -46,6 +47,7 @@ files:
 - spec/cuporter/node_spec.rb
 - spec/cuporter/feature_parser_spec.rb
 - spec/cuporter/support/functional/cli.rb
+- spec/cuporter/functional/scenario_outlines_spec.rb
 - spec/cuporter/functional/single_feature_spec.rb
 - spec/cuporter/tag_list_node_spec.rb
 - spec/spec_helper.rb