cuke_modeler 1.3.0 → 1.4.0

data/testing/rspec/spec/integration/step_integration_spec.rb

@@ -15,7 +15,7 @@ describe 'Step, Integration' do
   describe 'unique behavior' do
 
     it 'can be instantiated with the minimum viable Gherkin' do
-      source = "#{@step_keyword} a step"
+      source = "#{STEP_KEYWORD} a step"
 
       expect { clazz.new(source) }.to_not raise_error
     end
@@ -43,16 +43,32 @@ describe 'Step, Integration' do
       expect { clazz.new(source) }.to raise_error(/'cuke_modeler_stand_alone_step\.feature'/)
     end
 
-    it 'stores the original data generated by the parsing adapter (with a table)', :gherkin4 => true do
-      step = clazz.new("#{@step_keyword} test step\n|table|")
+    it 'stores the original data generated by the parsing adapter (with a table)', :gherkin6 => true do
+      step = clazz.new("#{STEP_KEYWORD} test step\n|table|")
+      data = step.parsing_data
+
+      expect(data.keys).to match_array([:location, :keyword, :text, :data_table, :doc_string])
+      expect(data[:text]).to eq('test step')
+    end
+
+    it 'stores the original data generated by the parsing adapter (with a doc string)', :gherkin6 => true do
+      step = clazz.new("#{STEP_KEYWORD} test step\n\"\"\"\na doc string\n\"\"\"")
+      data = step.parsing_data
+
+      expect(data.keys).to match_array([:location, :keyword, :text, :data_table, :doc_string])
+      expect(data[:text]).to eq('test step')
+    end
+
+    it 'stores the original data generated by the parsing adapter (with a table)', :gherkin4_5 => true do
+      step = clazz.new("#{STEP_KEYWORD} test step\n|table|")
       data = step.parsing_data
 
       expect(data.keys).to match_array([:type, :location, :keyword, :text, :argument])
       expect(data[:type]).to eq(:Step)
     end
 
-    it 'stores the original data generated by the parsing adapter (with a doc string)', :gherkin4 => true do
-      step = clazz.new("#{@step_keyword} test step\n\"\"\"\na doc string\n\"\"\"")
+    it 'stores the original data generated by the parsing adapter (with a doc string)', :gherkin4_5 => true do
+      step = clazz.new("#{STEP_KEYWORD} test step\n\"\"\"\na doc string\n\"\"\"")
       data = step.parsing_data
 
       expect(data.keys).to match_array([:type, :location, :keyword, :text, :argument])
@@ -60,7 +76,7 @@ describe 'Step, Integration' do
     end
 
     it 'stores the original data generated by the parsing adapter (with a table)', :gherkin3 => true do
-      step = clazz.new("#{@step_keyword} test step\n|table|")
+      step = clazz.new("#{STEP_KEYWORD} test step\n|table|")
       data = step.parsing_data
 
       expect(data.keys).to match_array([:type, :location, :keyword, :text, :argument])
@@ -68,7 +84,7 @@ describe 'Step, Integration' do
     end
 
     it 'stores the original data generated by the parsing adapter (with a doc string)', :gherkin3 => true do
-      step = clazz.new("#{@step_keyword} test step\n\"\"\"\na doc string\n\"\"\"")
+      step = clazz.new("#{STEP_KEYWORD} test step\n\"\"\"\na doc string\n\"\"\"")
       data = step.parsing_data
 
       expect(data.keys).to match_array([:type, :location, :keyword, :text, :argument])
@@ -76,31 +92,31 @@ describe 'Step, Integration' do
     end
 
     it 'stores the original data generated by the parsing adapter (with a table)', :gherkin2 => true do
-      step = clazz.new("#{@step_keyword} test step\n|table|")
+      step = clazz.new("#{STEP_KEYWORD} test step\n|table|")
       data = step.parsing_data
 
       expect(data.keys).to match_array(['keyword', 'name', 'line', 'rows'])
-      expect(data['keyword']).to eq("#{@step_keyword} ")
+      expect(data['keyword']).to eq("#{STEP_KEYWORD} ")
     end
 
     it 'stores the original data generated by the parsing adapter (with a doc string)', :gherkin2 => true do
-      step = clazz.new("#{@step_keyword} test step\n\"\"\"\na doc string\n\"\"\"")
+      step = clazz.new("#{STEP_KEYWORD} test step\n\"\"\"\na doc string\n\"\"\"")
       data = step.parsing_data
 
       expect(data.keys).to match_array(['keyword', 'name', 'line', 'doc_string'])
-      expect(data['keyword']).to eq("#{@step_keyword} ")
+      expect(data['keyword']).to eq("#{STEP_KEYWORD} ")
     end
 
     describe 'model population' do
 
       context 'from source text' do
 
-        let(:source_text) { "#{@step_keyword} a step" }
+        let(:source_text) { "#{STEP_KEYWORD} a step" }
         let(:step) { clazz.new(source_text) }
 
 
         it "models the step's keyword" do
-          expect(step.keyword).to eq("#{@step_keyword}")
+          expect(step.keyword).to eq("#{STEP_KEYWORD}")
         end
 
         it "models the step's text" do
@@ -108,10 +124,10 @@ describe 'Step, Integration' do
         end
 
         it "models the step's source line" do
-          source_text = "#{@feature_keyword}:
+          source_text = "#{FEATURE_KEYWORD}:
 
-                           #{@scenario_keyword}: foo
-                             #{@step_keyword} step"
+                           #{SCENARIO_KEYWORD}: foo
+                             #{STEP_KEYWORD} step"
           step = CukeModeler::Feature.new(source_text).tests.first.steps.first
 
           expect(step.source_line).to eq(4)
@@ -120,7 +136,7 @@ describe 'Step, Integration' do
 
         context 'with no block' do
 
-          let(:source_text) { "#{@step_keyword} a step" }
+          let(:source_text) { "#{STEP_KEYWORD} a step" }
           let(:step) { clazz.new(source_text) }
 
 
@@ -132,7 +148,7 @@ describe 'Step, Integration' do
 
         context 'a step with a table' do
 
-          let(:source_text) { "#{@step_keyword} a step
+          let(:source_text) { "#{STEP_KEYWORD} a step
                                  | value 1 |
                                  | value 2 |" }
           let(:step) { clazz.new(source_text) }
@@ -148,7 +164,7 @@ describe 'Step, Integration' do
 
         context 'a step with a doc string' do
 
-          let(:source_text) { "#{@step_keyword} a step
+          let(:source_text) { "#{STEP_KEYWORD} a step
                                  \"\"\"
                                  some text
                                  \"\"\"" }
@@ -169,11 +185,11 @@ describe 'Step, Integration' do
 
 
     it 'properly sets its child models' do
-      source_1 = "#{@step_keyword} a step
+      source_1 = "#{STEP_KEYWORD} a step
                   \"\"\"
                   a doc string
                   \"\"\""
-      source_2 = "#{@step_keyword} a step
+      source_2 = "#{STEP_KEYWORD} a step
                   | a block|"
 
       step_1 = clazz.new(source_1)
@@ -191,9 +207,9 @@ describe 'Step, Integration' do
     describe 'step comparison' do
 
       it 'is equal to another Step that has the same text' do
-        source_1 = "#{@step_keyword} a step"
-        source_2 = "#{@step_keyword} a step"
-        source_3 = "#{@step_keyword} a different step"
+        source_1 = "#{STEP_KEYWORD} a step"
+        source_2 = "#{STEP_KEYWORD} a step"
+        source_3 = "#{STEP_KEYWORD} a different step"
 
         step_1 = clazz.new(source_1)
         step_2 = clazz.new(source_2)
@@ -205,8 +221,8 @@ describe 'Step, Integration' do
       end
 
       it 'ignores steps keywords when comparing steps' do
-        source_1 = "#{@given_keyword} a step"
-        source_2 = "#{@then_keyword}  a step"
+        source_1 = "#{GIVEN_KEYWORD} a step"
+        source_2 = "#{THEN_KEYWORD}  a step"
 
         step_1 = clazz.new(source_1)
         step_2 = clazz.new(source_2)
@@ -216,8 +232,8 @@ describe 'Step, Integration' do
       end
 
       it 'ignores step tables when comparing steps' do
-        source_1 = "#{@step_keyword} a step"
-        source_2 = "#{@step_keyword} a step\n|with a table|"
+        source_1 = "#{STEP_KEYWORD} a step"
+        source_2 = "#{STEP_KEYWORD} a step\n|with a table|"
 
         step_1 = clazz.new(source_1)
         step_2 = clazz.new(source_2)
@@ -227,8 +243,8 @@ describe 'Step, Integration' do
       end
 
       it 'ignores step doc strings when comparing steps' do
-        source_1 = "#{@step_keyword} a step"
-        source_2 = "#{@step_keyword} a step\n\"\"\"\nwith a doc string\n\"\"\""
+        source_1 = "#{STEP_KEYWORD} a step"
+        source_2 = "#{STEP_KEYWORD} a step\n\"\"\"\nwith a doc string\n\"\"\""
 
 
         step_1 = clazz.new(source_1)
@@ -249,10 +265,10 @@ describe 'Step, Integration' do
 
 
       let(:test_directory) { CukeModeler::FileHelper.create_directory }
-      let(:source_gherkin) { "#{@feature_keyword}: Test feature
+      let(:source_gherkin) { "#{FEATURE_KEYWORD}: Test feature
 
-                              #{@scenario_keyword}: Test test
-                                #{@step_keyword} a step:"
+                              #{SCENARIO_KEYWORD}: Test test
+                                #{STEP_KEYWORD} a step:"
       }
 
       let(:directory_model) { CukeModeler::Directory.new(test_directory) }
@@ -281,10 +297,10 @@ describe 'Step, Integration' do
       context 'a step that is part of a scenario' do
 
         let(:test_directory) { CukeModeler::FileHelper.create_directory }
-        let(:source_gherkin) { "#{@feature_keyword}: Test feature
+        let(:source_gherkin) { "#{FEATURE_KEYWORD}: Test feature
 
-                                #{@scenario_keyword}: Test scenario
-                                  #{@step_keyword} a step"
+                                #{SCENARIO_KEYWORD}: Test scenario
+                                  #{STEP_KEYWORD} a step"
         }
 
         let(:directory_model) { CukeModeler::Directory.new(test_directory) }
@@ -302,11 +318,11 @@ describe 'Step, Integration' do
       context 'a step that is part of an outline' do
 
         let(:test_directory) { CukeModeler::FileHelper.create_directory }
-        let(:source_gherkin) { "#{@feature_keyword}: Test feature
+        let(:source_gherkin) { "#{FEATURE_KEYWORD}: Test feature
 
-                                #{@outline_keyword}: Test outline
-                                  #{@step_keyword} a step
-                                #{@example_keyword}:
+                                #{OUTLINE_KEYWORD}: Test outline
+                                  #{STEP_KEYWORD} a step
+                                #{EXAMPLE_KEYWORD}:
                                   | param |
                                   | value |"
         }
@@ -326,10 +342,10 @@ describe 'Step, Integration' do
       context 'a step that is part of a background' do
 
         let(:test_directory) { CukeModeler::FileHelper.create_directory }
-        let(:source_gherkin) { "#{@feature_keyword}: Test feature
+        let(:source_gherkin) { "#{FEATURE_KEYWORD}: Test feature
 
-                                #{@background_keyword}: Test background
-                                  #{@step_keyword} a step"
+                                #{BACKGROUND_KEYWORD}: Test background
+                                  #{STEP_KEYWORD} a step"
         }
 
         let(:directory_model) { CukeModeler::Directory.new(test_directory) }
@@ -359,13 +375,13 @@ describe 'Step, Integration' do
 
         context 'with no block' do
 
-          let(:source_text) { ["#{@step_keyword} a step"].join("\n") }
+          let(:source_text) { ["#{STEP_KEYWORD} a step"].join("\n") }
           let(:step) { clazz.new(source_text) }
 
           it 'can output a step' do
             step_output = step.to_s.split("\n", -1)
 
-            expect(step_output).to eq(["#{@step_keyword} a step"])
+            expect(step_output).to eq(["#{STEP_KEYWORD} a step"])
           end
 
           it 'can be remade from its own output' do
@@ -379,7 +395,7 @@ describe 'Step, Integration' do
 
         context 'a step with a table' do
 
-          let(:source_text) { ["#{@step_keyword} a step",
+          let(:source_text) { ["#{STEP_KEYWORD} a step",
                                '  | value1 | value2 |',
                                '  | value3 | value4 |'].join("\n") }
           let(:step) { clazz.new(source_text) }
@@ -388,7 +404,7 @@ describe 'Step, Integration' do
           it 'can output a step that has a table' do
             step_output = step.to_s.split("\n", -1)
 
-            expect(step_output).to eq(["#{@step_keyword} a step",
+            expect(step_output).to eq(["#{STEP_KEYWORD} a step",
                                        '  | value1 | value2 |',
                                        '  | value3 | value4 |'])
 
@@ -405,7 +421,7 @@ describe 'Step, Integration' do
 
         context 'a step with a doc string' do
 
-          let(:source_text) { ["#{@step_keyword} a step",
+          let(:source_text) { ["#{STEP_KEYWORD} a step",
                                '  """',
                                '  some text',
                                '  """'].join("\n") }
@@ -415,7 +431,7 @@ describe 'Step, Integration' do
           it 'can output a step that has a doc string' do
             step_output = step.to_s.split("\n", -1)
 
-            expect(step_output).to eq(["#{@step_keyword} a step",
+            expect(step_output).to eq(["#{STEP_KEYWORD} a step",
                                        '  """',
                                        '  some text',
                                        '  """'])

data/testing/rspec/spec/integration/table_integration_spec.rb

@@ -21,7 +21,15 @@ describe 'Table, Integration' do
       expect { clazz.new(source) }.to raise_error(/'cuke_modeler_stand_alone_table\.feature'/)
     end
 
-    it 'stores the original data generated by the parsing adapter', :gherkin4 => true do
+    it 'stores the original data generated by the parsing adapter', :gherkin6 => true do
+      table = clazz.new("| a table |")
+      data = table.parsing_data
+
+      expect(data.keys).to match_array([:location, :rows])
+      expect(data[:location][:line]).to eq(5)
+    end
+
+    it 'stores the original data generated by the parsing adapter', :gherkin4_5 => true do
       table = clazz.new("| a table |")
       data = table.parsing_data
 
@@ -74,10 +82,10 @@ describe 'Table, Integration' do
       context 'from source text' do
 
         it "models the table's source line" do
-          source_text = "#{@feature_keyword}:
+          source_text = "#{FEATURE_KEYWORD}:
 
-                           #{@scenario_keyword}:
-                             #{@step_keyword} step
+                           #{SCENARIO_KEYWORD}:
+                             #{STEP_KEYWORD} step
                                | value |"
           table = CukeModeler::Feature.new(source_text).tests.first.steps.first.block
 
@@ -125,10 +133,10 @@ describe 'Table, Integration' do
 
 
       let(:test_directory) { CukeModeler::FileHelper.create_directory }
-      let(:source_gherkin) { "#{@feature_keyword}: Test feature
+      let(:source_gherkin) { "#{FEATURE_KEYWORD}: Test feature
 
-                              #{@scenario_keyword}: Test test
-                                #{@step_keyword} a step:
+                              #{SCENARIO_KEYWORD}: Test test
+                                #{STEP_KEYWORD} a step:
                                   | a | table |"
       }
 
@@ -157,10 +165,10 @@ describe 'Table, Integration' do
       context 'a table that is part of a scenario' do
 
         let(:test_directory) { CukeModeler::FileHelper.create_directory }
-        let(:source_gherkin) { "#{@feature_keyword}: Test feature
+        let(:source_gherkin) { "#{FEATURE_KEYWORD}: Test feature
 
-                                #{@scenario_keyword}: Test test
-                                  #{@step_keyword} a step:
+                                #{SCENARIO_KEYWORD}: Test test
+                                  #{STEP_KEYWORD} a step:
                                     | a | table |"
         }
 
@@ -179,12 +187,12 @@ describe 'Table, Integration' do
       context 'a table that is part of an outline' do
 
         let(:test_directory) { CukeModeler::FileHelper.create_directory }
-        let(:source_gherkin) { "#{@feature_keyword}: Test feature
+        let(:source_gherkin) { "#{FEATURE_KEYWORD}: Test feature
 
-                                #{@outline_keyword}: Test outline
-                                  #{@step_keyword} a step:
+                                #{OUTLINE_KEYWORD}: Test outline
+                                  #{STEP_KEYWORD} a step:
                                     | a | table |
-                                #{@example_keyword}:
+                                #{EXAMPLE_KEYWORD}:
                                   | param |
                                   | value |"
         }
@@ -204,10 +212,10 @@ describe 'Table, Integration' do
       context 'a table that is part of a background' do
 
         let(:test_directory) { CukeModeler::FileHelper.create_directory }
-        let(:source_gherkin) { "#{@feature_keyword}: Test feature
+        let(:source_gherkin) { "#{FEATURE_KEYWORD}: Test feature
 
-                                #{@background_keyword}: Test background
-                                  #{@step_keyword} a step:
+                                #{BACKGROUND_KEYWORD}: Test background
+                                  #{STEP_KEYWORD} a step:
                                     | a | table |"
         }
 

data/testing/rspec/spec/integration/tag_integration_spec.rb

@@ -43,7 +43,15 @@ describe 'Tag, Integration' do
       expect { clazz.new(source) }.to raise_error(/'cuke_modeler_stand_alone_tag\.feature'/)
     end
 
-    it 'stores the original data generated by the parsing adapter', :gherkin4 => true do
+    it 'stores the original data generated by the parsing adapter', :gherkin6 => true do
+      tag = clazz.new('@a_tag')
+      data = tag.parsing_data
+
+      expect(data.keys).to match_array([:location, :name])
+      expect(data[:name]).to eq('@a_tag')
+    end
+
+    it 'stores the original data generated by the parsing adapter', :gherkin4_5 => true do
       tag = clazz.new('@a_tag')
       data = tag.parsing_data
 
@@ -77,13 +85,13 @@ describe 'Tag, Integration' do
 
       let(:test_directory) { CukeModeler::FileHelper.create_directory }
       let(:source_gherkin) { "@feature_tag
-                              #{@feature_keyword}: Test feature
+                              #{FEATURE_KEYWORD}: Test feature
 
-                                #{@outline_keyword}: Test test
-                                  #{@step_keyword} a step
+                                #{OUTLINE_KEYWORD}: Test test
+                                  #{STEP_KEYWORD} a step
 
                                 @example_tag
-                                #{@example_keyword}: Test example
+                                #{EXAMPLE_KEYWORD}: Test example
                                   | a param |
                                   | a value |"
       }
@@ -114,11 +122,11 @@ describe 'Tag, Integration' do
       context 'a tag that is part of a scenario' do
 
         let(:test_directory) { CukeModeler::FileHelper.create_directory }
-        let(:source_gherkin) { "#{@feature_keyword}: Test feature
+        let(:source_gherkin) { "#{FEATURE_KEYWORD}: Test feature
 
                                   @a_tag
-                                  #{@scenario_keyword}: Test scenario
-                                    #{@step_keyword} a step"
+                                  #{SCENARIO_KEYWORD}: Test scenario
+                                    #{STEP_KEYWORD} a step"
         }
 
         let(:directory_model) { CukeModeler::Directory.new(test_directory) }
@@ -136,12 +144,12 @@ describe 'Tag, Integration' do
       context 'a tag that is part of an outline' do
 
         let(:test_directory) { CukeModeler::FileHelper.create_directory }
-        let(:source_gherkin) { "#{@feature_keyword}: Test feature
+        let(:source_gherkin) { "#{FEATURE_KEYWORD}: Test feature
 
                                 @a_tag
-                                #{@outline_keyword}: Test outline
-                                  #{@step_keyword} a step
-                                #{@example_keyword}:
+                                #{OUTLINE_KEYWORD}: Test outline
+                                  #{STEP_KEYWORD} a step
+                                #{EXAMPLE_KEYWORD}:
                                   | param |
                                   | value |"
         }
@@ -161,12 +169,12 @@ describe 'Tag, Integration' do
       context 'a tag that is part of an example' do
 
         let(:test_directory) { CukeModeler::FileHelper.create_directory }
-        let(:source_gherkin) { "#{@feature_keyword}: Test feature
+        let(:source_gherkin) { "#{FEATURE_KEYWORD}: Test feature
 
-                                #{@outline_keyword}: Test outline
-                                  #{@step_keyword} a step
+                                #{OUTLINE_KEYWORD}: Test outline
+                                  #{STEP_KEYWORD} a step
                                 @a_tag
-                                #{@example_keyword}:
+                                #{EXAMPLE_KEYWORD}:
                                   | param |
                                   | value |"
         }
@@ -205,11 +213,11 @@ describe 'Tag, Integration' do
         end
 
         it "models the tag's source line" do
-          source_text = "#{@feature_keyword}:
+          source_text = "#{FEATURE_KEYWORD}:
 
                            @a_tag
-                           #{@scenario_keyword}:
-                             #{@step_keyword} step"
+                           #{SCENARIO_KEYWORD}:
+                             #{STEP_KEYWORD} step"
           tag = CukeModeler::Feature.new(source_text).tests.first.tags.first
 
           expect(tag.source_line).to eq(3)