cuke_modeler 2.0.0 → 2.1.0

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

@@ -21,36 +21,32 @@ 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', :gherkin6 => true do
-      table = clazz.new("| a table |")
-      data = table.parsing_data
+    describe 'parsing data' do
 
-      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', :if => gherkin?(6, 7, 8, 9) do
+        table = clazz.new("| a table |")
+        data = table.parsing_data
 
-    it 'stores the original data generated by the parsing adapter', :gherkin4_5 => 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
 
-      expect(data.keys).to match_array([:type, :location, :rows])
-      expect(data[:type]).to eq(:DataTable)
-    end
+      it 'stores the original data generated by the parsing adapter', :if => gherkin?(3, 4, 5) do
+        table = clazz.new("| a table |")
+        data = table.parsing_data
 
-    it 'stores the original data generated by the parsing adapter', :gherkin3 => true do
-      table = clazz.new("| a table |")
-      data = table.parsing_data
+        expect(data.keys).to match_array([:type, :location, :rows])
+        expect(data[:type]).to eq(:DataTable)
+      end
 
-      expect(data.keys).to match_array([:type, :location, :rows])
-      expect(data[:type]).to eq(:DataTable)
-    end
+      it 'stores the original data generated by the parsing adapter', :if => gherkin?(2) do
+        table = clazz.new("| a table |")
+        data = table.parsing_data
 
-    it 'stores the original data generated by the parsing adapter', :gherkin2 => true do
-      table = clazz.new("| a table |")
-      data = table.parsing_data
+        # There is no parsing data for the table itself, only its rows
+        expect(data).to match_array([])
+      end
 
-      # There is no parsing data for the table itself, only its rows
-      expect(data).to match_array([])
     end
 
     it 'can be instantiated with the minimum viable Gherkin' do

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

@@ -43,36 +43,48 @@ 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', :gherkin6 => true do
-      tag = clazz.new('@a_tag')
-      data = tag.parsing_data
+    describe 'parsing data' do
 
-      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', :if => gherkin?(8, 9) do
+        tag = clazz.new('@a_tag')
+        data = tag.parsing_data
 
-    it 'stores the original data generated by the parsing adapter', :gherkin4_5 => true do
-      tag = clazz.new('@a_tag')
-      data = tag.parsing_data
+        expect(data.keys).to match_array([:location, :name, :id])
+        expect(data[:name]).to eq('@a_tag')
+      end
 
-      expect(data.keys).to match_array([:type, :location, :name])
-      expect(data[:type]).to eq(:Tag)
-    end
+      it 'stores the original data generated by the parsing adapter', :if => gherkin?(6, 7) do
+        tag = clazz.new('@a_tag')
+        data = tag.parsing_data
 
-    it 'stores the original data generated by the parsing adapter', :gherkin3 => 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
 
-      expect(data.keys).to match_array([:type, :location, :name])
-      expect(data[:type]).to eq('Tag')
-    end
+      it 'stores the original data generated by the parsing adapter', :if => gherkin?(4, 5) do
+        tag = clazz.new('@a_tag')
+        data = tag.parsing_data
+
+        expect(data.keys).to match_array([:type, :location, :name])
+        expect(data[:type]).to eq(:Tag)
+      end
+
+      it 'stores the original data generated by the parsing adapter', :if => gherkin?(3) do
+        tag = clazz.new('@a_tag')
+        data = tag.parsing_data
+
+        expect(data.keys).to match_array([:type, :location, :name])
+        expect(data[:type]).to eq('Tag')
+      end
+
+      it 'stores the original data generated by the parsing adapter', :if => gherkin?(2) do
+        tag = clazz.new('@a_tag')
+        data = tag.parsing_data
 
-    it 'stores the original data generated by the parsing adapter', :gherkin2 => true do
-      tag = clazz.new('@a_tag')
-      data = tag.parsing_data
+        expect(data.keys).to match_array(['name', 'line'])
+        expect(data['name']).to eq('@a_tag')
+      end
 
-      expect(data.keys).to match_array(['name', 'line'])
-      expect(data['name']).to eq('@a_tag')
     end
 
 

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

@@ -21,15 +21,11 @@ describe 'Parsing, Integration' do
       end
     end
 
-    it 'loads the correct dialects based on the version of Gherkin used', :gherkin6 => true do
+    it 'loads the correct dialects based on the version of Gherkin used', :unless => gherkin?(2) do
       expect(nodule.dialects).to equal(Gherkin::DIALECTS)
     end
 
-    it 'loads the correct dialects based on the version of Gherkin used', :gherkin3 => true, :gherkin4_5 => true do
-      expect(nodule.dialects).to equal(Gherkin::DIALECTS)
-    end
-
-    it 'loads the correct dialects based on the version of Gherkin used', :gherkin2 => true do
+    it 'loads the correct dialects based on the version of Gherkin used', :if => gherkin?(2) do
       expect(nodule.dialects).to equal(Gherkin::I18n::LANGUAGES)
     end
 
@@ -117,6 +113,31 @@ describe 'Parsing, Integration' do
 
     end
 
+    describe 'parsing invalid Gherkin' do
+
+      it 'correctly bubbles up parsing errors', :if => gherkin?(6, 7, 8, 9) do
+        expect { nodule.parse_text('bad file') }.to raise_error(/RuntimeError.*#EOF/)
+      end
+
+      it 'correctly bubbles up parsing errors', :if => gherkin?(4, 5) do
+        expect { nodule.parse_text('bad file') }.to raise_error(/Gherkin::CompositeParserException.*#EOF/m)
+      end
+
+      it 'correctly bubbles up parsing errors', :if => gherkin?(3) do
+        expect { nodule.parse_text('bad file') }.to raise_error(/Gherkin::CompositeParserException.*unexpected end of file/m)
+      end
+
+      it 'correctly bubbles up parsing errors', :if => gherkin?(2) do
+        # A different error is thrown on JRuby
+        if RUBY_PLATFORM == "java"
+          expect { nodule.parse_text('bad file') }.to raise_error(/Java::GherkinLexer.*_FEATURE_END_/m)
+        else
+          expect { nodule.parse_text('bad file') }.to raise_error(/Gherkin::Lexer::LexingError.*error on line 1/)
+        end
+      end
+
+    end
+
   end
 
 end

data/testing/rspec/spec/spec_helper.rb

@@ -25,6 +25,7 @@ require "#{this_dir}/unit/shared/keyworded_models_unit_specs"
 
 require "#{this_dir}/../../dialect_helper"
 require "#{this_dir}/../../file_helper"
+require "#{this_dir}/../../helper_methods"
 
 require 'rubygems/mock_gem_ui'
 
@@ -33,21 +34,48 @@ require 'rubygems/mock_gem_ui'
 # implementation and making the test dialect the default dialect so that language headers
 # aren't needed for all of the test code. Only possible with some versions of Gherkin.
 
-gherkin_version = Gem.loaded_specs['gherkin'].version.version
-
-case gherkin_version
-  when /^6\./
-    # gherkin 6 does not preload the dialect module
-    require 'gherkin/dialect' if Gem.loaded_specs['gherkin'].version.version[/^6\./]
+gherkin_major_version = Gem.loaded_specs['gherkin'].version.version.match(/^(\d+)\./)[1].to_i
 
+case gherkin_major_version
+  when 8, 9
     # TODO: choose randomly from Gherkin::DIALECTS once I figure out how to handle encodings...
     test_dialect = ['en', 'en-lol', 'en-pirate', 'en-Scouse'].sample
     puts "Testing with dialect '#{test_dialect}'..."
 
+    CukeModeler::DialectHelper.set_dialect(Gherkin::DIALECTS[test_dialect])
+    CukeModeler::Parsing.dialect = test_dialect
+
+    module Gherkin
+      class << self
+        alias_method :original_from_source, :from_source
+
+        def from_source(uri, data, options = {})
+          options[:default_dialect] ||= CukeModeler::Parsing.dialect
+          original_from_source(uri, data, options)
+        end
+      end
+    end
+  when 6, 7
+    # TODO: choose randomly from Gherkin::DIALECTS once I figure out how to handle encodings...
+    test_dialect = ['en', 'en-lol', 'en-pirate', 'en-Scouse'].sample
+    puts "Testing with dialect '#{test_dialect}'..."
 
     CukeModeler::DialectHelper.set_dialect(Gherkin::DIALECTS[test_dialect])
     CukeModeler::Parsing.dialect = test_dialect
-  when /^[543]\./
+
+    module Gherkin
+      class Gherkin
+        class << self
+          alias_method :original_from_source, :from_source
+
+          def from_source(uri, data, options = {})
+            options[:default_dialect] ||= CukeModeler::Parsing.dialect
+            original_from_source(uri, data, options)
+          end
+        end
+      end
+    end
+  when 3, 4, 5
 # TODO: stop using test dialect and just randomize for all version of `gherkin`
     dialect_file_path = "#{this_dir}/../../test_languages.json"
     test_dialects = JSON.parse File.open(dialect_file_path, 'r:UTF-8').read
@@ -69,41 +97,17 @@ case gherkin_version
 
     CukeModeler::DialectHelper.set_dialect(test_dialects['cm-test'])
     CukeModeler::Parsing.dialect = 'cm-test'
-  when /^2\./
+  when 2
     CukeModeler::DialectHelper.set_dialect(Gherkin::I18n::LANGUAGES['en'])
     CukeModeler::Parsing.dialect = 'en'
   else
-    raise("Unknown Gherkin version: '#{gherkin_version}'")
+    raise("Unknown Gherkin major version: '#{gherkin_major_version}'")
 end
 
 
 RSpec.configure do |config|
-  gherkin_version = Gem.loaded_specs['gherkin'].version.version
-
-  case gherkin_version
-    when /^6\./
-      config.filter_run_excluding :gherkin2 => true,
-                                  :gherkin3 => true,
-                                  :gherkin4_5 => true,
-                                  :gherkin6 => false
-    when /^[54]\./
-      config.filter_run_excluding :gherkin2 => true,
-                                  :gherkin3 => true,
-                                  :gherkin4_5 => false,
-                                  :gherkin6 => true
-    when /^3\./
-      config.filter_run_excluding :gherkin2 => true,
-                                  :gherkin3 => false,
-                                  :gherkin4_5 => true,
-                                  :gherkin6 => true
-    when /^2\./
-      config.filter_run_excluding :gherkin2 => false,
-                                  :gherkin3 => true,
-                                  :gherkin4_5 => true,
-                                  :gherkin6 => true
-    else
-      raise("Unknown Gherkin version: '#{gherkin_version}'")
-  end
+
+  include CukeModeler::HelperMethods
 
   config.before(:suite) do
     FEATURE_KEYWORD = CukeModeler::DialectHelper.feature_keyword
@@ -122,15 +126,4 @@ RSpec.configure do |config|
     end
   end
 
-
-  def assert_bidirectional_equality(base_thing, compared_thing)
-    expect(base_thing).to eq(compared_thing)
-    expect(compared_thing).to eq(base_thing)
-  end
-
-  def assert_bidirectional_inequality(base_thing, compared_thing)
-    expect(base_thing).to_not eq(compared_thing)
-    expect(compared_thing).to_not eq(base_thing)
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuke_modeler
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Eric Kessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +196,11 @@ files:
 - lib/cuke_modeler/adapters/gherkin_2_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_3_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_4_adapter.rb
+- lib/cuke_modeler/adapters/gherkin_5_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_6_adapter.rb
+- lib/cuke_modeler/adapters/gherkin_7_adapter.rb
+- lib/cuke_modeler/adapters/gherkin_8_adapter.rb
+- lib/cuke_modeler/adapters/gherkin_9_adapter.rb
 - lib/cuke_modeler/containing.rb
 - lib/cuke_modeler/described.rb
 - lib/cuke_modeler/models/background.rb
@@ -274,10 +278,18 @@ files:
 - testing/gemfiles/gherkin4.gemfile
 - testing/gemfiles/gherkin5.gemfile
 - testing/gemfiles/gherkin6.gemfile
+- testing/gemfiles/gherkin7.gemfile
+- testing/gemfiles/gherkin8.gemfile
+- testing/gemfiles/gherkin9.gemfile
+- testing/helper_methods.rb
 - testing/rspec/spec/integration/adapters/gherkin_2_adapter_spec.rb
 - testing/rspec/spec/integration/adapters/gherkin_3_adapter_spec.rb
 - testing/rspec/spec/integration/adapters/gherkin_4_adapter_spec.rb
+- testing/rspec/spec/integration/adapters/gherkin_5_adapter_spec.rb
 - testing/rspec/spec/integration/adapters/gherkin_6_adapter_spec.rb
+- testing/rspec/spec/integration/adapters/gherkin_7_adapter_spec.rb
+- testing/rspec/spec/integration/adapters/gherkin_8_adapter_spec.rb
+- testing/rspec/spec/integration/adapters/gherkin_9_adapter_spec.rb
 - testing/rspec/spec/integration/models/background_integration_spec.rb
 - testing/rspec/spec/integration/models/cell_integration_spec.rb
 - testing/rspec/spec/integration/models/comment_integration_spec.rb