cuke_modeler 1.3.0 → 1.4.0

data/testing/rspec/spec/spec_helper.rb

@@ -26,65 +26,94 @@ require "#{this_dir}/unit/shared/keyworded_models_unit_specs"
 require "#{this_dir}/../../dialect_helper"
 require "#{this_dir}/../../file_helper"
 
-# Use a fake dialect for testing in order to avoid hard coded language assumptions in the
-# implementation. Only possible with newer versions of Gherkin.
-if Gem.loaded_specs['gherkin'].version.version[/^2\./]
-  CukeModeler::DialectHelper.set_dialect(Gherkin::I18n::LANGUAGES['en'])
-  CukeModeler::Parsing.dialect = 'en'
-else
-  dialect_file_path = "#{this_dir}/../../test_languages.json"
-  test_dialects = JSON.parse File.open(dialect_file_path, 'r:UTF-8').read
+# Use a random dialect for testing in order to avoid hard coded language assumptions in the
+# 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::DIALECTS.merge!(test_dialects)
+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\./]
 
-  # Making the test dialect the default dialect so that language headers aren't
-  # needed for all of the test code.
-  module Gherkin
-    class Parser
+    # 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}'..."
 
-      alias_method :original_parse, :parse
 
-      def parse(token_scanner, token_matcher = TokenMatcher.new('cm-test'))
-        original_parse(token_scanner, token_matcher)
-      end
+    CukeModeler::DialectHelper.set_dialect(Gherkin::DIALECTS[test_dialect])
+    CukeModeler::Parsing.dialect = test_dialect
+  when /^[543]\./
+# 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
+
+    Gherkin::DIALECTS.merge!(test_dialects)
+
+
+    module Gherkin
+      class Parser
 
+        alias_method :original_parse, :parse
+
+        def parse(token_scanner, token_matcher = TokenMatcher.new('cm-test'))
+          original_parse(token_scanner, token_matcher)
+        end
+
+      end
     end
-  end
 
-  CukeModeler::DialectHelper.set_dialect(test_dialects['cm-test'])
-  CukeModeler::Parsing.dialect = 'cm-test'
+    CukeModeler::DialectHelper.set_dialect(test_dialects['cm-test'])
+    CukeModeler::Parsing.dialect = 'cm-test'
+  when /^2\./
+    CukeModeler::DialectHelper.set_dialect(Gherkin::I18n::LANGUAGES['en'])
+    CukeModeler::Parsing.dialect = 'en'
+  else
+    raise("Unknown Gherkin version: '#{gherkin_version}'")
 end
 
 
 RSpec.configure do |config|
-  case Gem.loaded_specs['gherkin'].version.version
+  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 => false
+                                  :gherkin4_5 => false,
+                                  :gherkin6 => true
     when /^3\./
       config.filter_run_excluding :gherkin2 => true,
                                   :gherkin3 => false,
-                                  :gherkin4 => true
-    else
+                                  :gherkin4_5 => true,
+                                  :gherkin6 => true
+    when /^2\./
       config.filter_run_excluding :gherkin2 => false,
                                   :gherkin3 => true,
-                                  :gherkin4 => true
+                                  :gherkin4_5 => true,
+                                  :gherkin6 => true
+    else
+      raise("Unknown Gherkin version: '#{gherkin_version}'")
   end
 
-  config.before(:all) do
-    @feature_keyword = CukeModeler::DialectHelper.feature_keyword
-    @background_keyword = CukeModeler::DialectHelper.background_keyword
-    @scenario_keyword = CukeModeler::DialectHelper.scenario_keyword
-    @outline_keyword = CukeModeler::DialectHelper.outline_keyword
-    @example_keyword = CukeModeler::DialectHelper.example_keyword
-    @step_keyword = CukeModeler::DialectHelper.step_keyword
-    @given_keyword = CukeModeler::DialectHelper.given_keyword
-    @then_keyword = CukeModeler::DialectHelper.then_keyword
+  config.before(:suite) do
+    FEATURE_KEYWORD = CukeModeler::DialectHelper.feature_keyword
+    BACKGROUND_KEYWORD = CukeModeler::DialectHelper.background_keyword
+    SCENARIO_KEYWORD = CukeModeler::DialectHelper.scenario_keyword
+    OUTLINE_KEYWORD = CukeModeler::DialectHelper.outline_keyword
+    EXAMPLE_KEYWORD = CukeModeler::DialectHelper.example_keyword
+    STEP_KEYWORD = CukeModeler::DialectHelper.step_keyword
+    GIVEN_KEYWORD = CukeModeler::DialectHelper.given_keyword
+    THEN_KEYWORD = CukeModeler::DialectHelper.then_keyword
   end
 
-  config.after(:all) do
+  config.after(:suite) do
     CukeModeler::FileHelper.created_directories.each do |dir_path|
       FileUtils.remove_entry(dir_path, true)
     end

data/todo.txt

@@ -9,7 +9,9 @@ document helper modules as not part of the public API
 
 # todo - incorporate cuke_modeler extensions from other projects
 # todo - add plenty of testing around weird and minimal gherkin text for all models
-
+# todo - add support for `Rule` keyword
+# todo - incorporate new flexibility of `Example` keyword, etc.
+# todo - Have CukeModeler::Parsing.dialect also control the default dialect used by Gherkin
 
 Backlog
 -------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuke_modeler
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Eric Kessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +182,7 @@ 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_6_adapter.rb
 - lib/cuke_modeler/containing.rb
 - lib/cuke_modeler/described.rb
 - lib/cuke_modeler/models/background.rb
@@ -251,13 +252,13 @@ files:
 - testing/cucumber/step_definitions/tag_steps.rb
 - testing/cucumber/step_definitions/verification_steps.rb
 - testing/cucumber/support/env.rb
-- testing/cucumber/support/transforms.rb
 - testing/dialect_helper.rb
 - testing/file_helper.rb
 - testing/gemfiles/gherkin2.gemfile
 - testing/gemfiles/gherkin3.gemfile
 - testing/gemfiles/gherkin4.gemfile
 - testing/gemfiles/gherkin5.gemfile
+- testing/gemfiles/gherkin6.gemfile
 - testing/rspec/spec/integration/background_integration_spec.rb
 - testing/rspec/spec/integration/cell_integration_spec.rb
 - testing/rspec/spec/integration/comment_integration_spec.rb
@@ -269,6 +270,7 @@ files:
 - testing/rspec/spec/integration/gherkin_2_adapter_spec.rb
 - testing/rspec/spec/integration/gherkin_3_adapter_spec.rb
 - testing/rspec/spec/integration/gherkin_4_adapter_spec.rb
+- testing/rspec/spec/integration/gherkin_6_adapter_spec.rb
 - testing/rspec/spec/integration/model_integration_spec.rb
 - testing/rspec/spec/integration/nested_integration_spec.rb
 - testing/rspec/spec/integration/outline_integration_spec.rb
@@ -338,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A gem providing functionality to model Gherkin based test suites.

data/testing/cucumber/support/transforms.rb

@@ -1,3 +0,0 @@
-Transform /^(-?\d+)$/ do |number|
-  number.to_i
-end