cql 1.4.1 → 1.7.0

data/testing/rspec/spec/filter_example_spec.rb

@@ -50,7 +50,7 @@ describe "example filters (with)" do
                                                }
 
   it 'should filter by multiple filters' do
-    gs = CQL::Repository.new("#{@feature_fixtures_directory}/examples/filters/tag_count")
+    gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/examples/filters/tag_count")
 
     result = gs.query do
       select name

data/testing/rspec/spec/filter_feature_dsl_spec.rb

@@ -5,7 +5,7 @@ describe "feature filters (with)" do
   describe 'scenario outline and scenario count functions (ssoc)' do
 
     it 'should filter based on ssoc_gt' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/combined/a")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/combined/a")
 
       expected_results = {5 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f2_7_scenarios_2_so"}]}
 
@@ -21,7 +21,7 @@ describe "feature filters (with)" do
     end
 
     it 'should filter based on ssoc_gte' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/combined/a")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/combined/a")
 
       expected_results = {1 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f2_7_scenarios_2_so"}, {"name" => "f3_2_scenarios_3_so"}],
                           5 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f2_7_scenarios_2_so"}, {"name" => "f3_2_scenarios_3_so"}],
@@ -40,7 +40,7 @@ describe "feature filters (with)" do
     end
 
     it 'should filter based on ssoc_lt' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/combined/a")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/combined/a")
 
       expected_results = {10 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f2_7_scenarios_2_so"}, {"name" => "f3_2_scenarios_3_so"}],
                           9 => [{"name" => "f3_2_scenarios_3_so"}],
@@ -58,7 +58,7 @@ describe "feature filters (with)" do
     end
 
     it 'should filter based on ssoc_lte' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/combined/a")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/combined/a")
 
       expected_results = {10 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f2_7_scenarios_2_so"}, {"name" => "f3_2_scenarios_3_so"}],
                           9 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f2_7_scenarios_2_so"}, {"name" => "f3_2_scenarios_3_so"}],
@@ -81,7 +81,7 @@ describe "feature filters (with)" do
 
   describe 'scenario count functions (sc)' do
     it 'should filter based on sc_gt' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/combined/a")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/combined/a")
 
       expected_results = {2 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f2_7_scenarios_2_so"}]}
 
@@ -97,7 +97,7 @@ describe "feature filters (with)" do
     end
 
     it 'should filter based on sc_gte' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/combined/a")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/combined/a")
 
       expected_results = {2 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f2_7_scenarios_2_so"}, {"name" => "f3_2_scenarios_3_so"}],
                           4 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f2_7_scenarios_2_so"}],
@@ -116,7 +116,7 @@ describe "feature filters (with)" do
     end
 
     it 'should filter based on sc_lt' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/combined/a")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/combined/a")
 
       expected_results = {
           7 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f3_2_scenarios_3_so"}],
@@ -135,7 +135,7 @@ describe "feature filters (with)" do
     end
 
     it 'should filter based on sc_lte' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/combined/a")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/combined/a")
 
       expected_results = {7 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f2_7_scenarios_2_so"}, {"name" => "f3_2_scenarios_3_so"}],
                           5 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f3_2_scenarios_3_so"}],
@@ -188,7 +188,7 @@ describe "feature filters (with)" do
 
   describe 'scenario outline count functions (soc)' do
     it 'should filter based on soc_gt' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/combined/a")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/combined/a")
 
       expected_results = {2 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f3_2_scenarios_3_so"}],
                           5 => []}
@@ -205,7 +205,7 @@ describe "feature filters (with)" do
     end
 
     it 'should filter based on soc_gte' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/combined/a")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/combined/a")
 
       expected_results = {2 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f2_7_scenarios_2_so"}, {"name" => "f3_2_scenarios_3_so"}],
                           3 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f3_2_scenarios_3_so"}],
@@ -224,7 +224,7 @@ describe "feature filters (with)" do
     end
 
     it 'should filter based on soc_lt' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/combined/a")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/combined/a")
 
       expected_results = {7 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f2_7_scenarios_2_so"}, {"name" => "f3_2_scenarios_3_so"}],
                           5 => [{"name" => "f2_7_scenarios_2_so"}, {"name" => "f3_2_scenarios_3_so"}],
@@ -243,7 +243,7 @@ describe "feature filters (with)" do
     end
 
     it 'should filter based on soc_lte' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/combined/a")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/combined/a")
 
       expected_results = {7 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f2_7_scenarios_2_so"}, {"name" => "f3_2_scenarios_3_so"}],
                           5 => [{"name" => "f1_4_scenarios_5_so"}, {"name" => "f2_7_scenarios_2_so"}, {"name" => "f3_2_scenarios_3_so"}],
@@ -271,7 +271,7 @@ describe "feature filters (with)" do
 
 
   it 'should filter by multiple filters' do
-    gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/tagged_features")
+    gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/tagged_features")
 
     result = gs.query do
       select name

data/testing/rspec/spec/filter_sso_spec.rb

@@ -126,7 +126,7 @@ describe "scenario and outline filters (with)" do
                                                                                                   /will not be found/ => []}}}
 
   it 'should filter by multiple filters' do
-    gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/tag_count")
+    gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/tag_count")
 
     result = gs.query do
       select name
@@ -139,7 +139,7 @@ describe "scenario and outline filters (with)" do
   end
 
   it 'should filter by multiple filters' do
-    gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/filters/tag_count")
+    gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines/filters/tag_count")
 
     result = gs.query do
       select name

data/testing/rspec/spec/line_filterable_specs.rb

@@ -38,7 +38,7 @@ shared_examples_for 'a line filterable target set' do |target_type, test_data|
     end
 
     it 'can only handle a string or regular expression' do
-      gs = CQL::Repository.new(@feature_fixtures_directory)
+      gs = CQL::Repository.new(CQL_FEATURE_FIXTURES_DIRECTORY)
 
       expect { gs.query do
         select name

data/testing/rspec/spec/map_reduce_spec.rb

@@ -7,7 +7,7 @@ describe "cql" do
   #   it 'should find the physical files' do
   #     skip("This is possibly no longer be needed")
   #
-  #     gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
+  #     gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple")
   #     result = CQL::MapReduce.uri(gs.parsed_feature_files)
   #
   #     expect(result[0]).to match(/simple\.feature/)

data/testing/rspec/spec/model_query_spec.rb

@@ -1,7 +1,7 @@
 require "#{File.dirname(__FILE__)}/spec_helper"
 
 
-describe 'a query enhanced model', :cuke_modeler_1x => true do
+describe 'a query enhanced model', :unless => cuke_modeler?(0) do
 
   let(:clazz) { CukeModeler::Model }
   let(:model) { clazz.new }

data/testing/rspec/spec/multiple_queries_spec.rb

@@ -6,7 +6,7 @@ describe "cql" do
   describe 'repo' do
     it 'should not change between queries' do
 
-      repo = CQL::Repository.new("#{@feature_fixtures_directory}/got")
+      repo = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/got")
 
       before_dump = Marshal.dump(repo)
 

data/testing/rspec/spec/name_filterable_specs.rb

@@ -38,7 +38,7 @@ shared_examples_for 'a name filterable target set' do |target_type, test_data|
     end
 
     it 'can only handle a string or regular expression' do
-      gs = CQL::Repository.new(@feature_fixtures_directory)
+      gs = CQL::Repository.new(CQL_FEATURE_FIXTURES_DIRECTORY)
 
       expect { gs.query do
         select name

data/testing/rspec/spec/predefined_filters_spec.rb

@@ -0,0 +1,284 @@
+require "#{File.dirname(__FILE__)}/spec_helper"
+
+
+describe "predefined 'with' filters" do
+
+  let(:nodule) { CQL::Dsl }
+  let(:dsl_enabled_object) { Object.new.extend(nodule) }
+
+
+  describe 'count filters' do
+
+    describe 'tag count' do
+
+      describe 'equality' do
+
+        it 'correctly filters features' do
+          feature_1 = CukeModeler::Feature.new('@tag
+                                                Feature: Feature with 1 tag')
+          feature_2 = CukeModeler::Feature.new('@tag @tag
+                                                Feature: Feature with 2 tags')
+          feature_3 = CukeModeler::Feature.new('@tag @tag @tag
+                                                Feature: Feature with 3 tags')
+          gs = CQL::Repository.new(directory_with(feature_1, feature_2, feature_3))
+
+          result = gs.query do
+            select name
+            from features
+            with tc eq 2
+          end
+
+          expect(result).to eq([{'name' => 'Feature with 2 tags'}])
+        end
+
+        it 'correctly filters scenarios' do
+          gherkin = 'Feature:
+
+                       @tag
+                       Scenario: Test with 1 tag
+
+                       @tag @tag
+                       Scenario: Test with 2 tags
+
+                       @tag @tag @tag
+                       Scenario: Test with 3 tags'
+          gs = CQL::Repository.new(CukeModeler::Feature.new(gherkin))
+
+          result = gs.query do
+            select name
+            from scenarios
+            with tc eq 2
+          end
+
+          expect(result).to eq([{'name' => 'Test with 2 tags'}])
+        end
+
+        it 'correctly filters outlines' do
+          gherkin = 'Feature:
+
+                       @tag
+                       Scenario Outline: Test with 1 tag
+                         * a step
+
+                       @tag @tag
+                       Scenario Outline: Test with 2 tags
+                         * a step
+
+                       @tag @tag @tag
+                       Scenario Outline: Test with 3 tags
+                         * a step'
+          gs = CQL::Repository.new(CukeModeler::Feature.new(gherkin))
+
+          result = gs.query do
+            select name
+            from outlines
+            with tc eq 2
+          end
+
+          expect(result).to eq([{'name' => 'Test with 2 tags'}])
+        end
+
+        it 'correctly filters examples' do
+          gherkin = 'Feature:
+
+                       Scenario Outline:
+                         * a step
+
+                       @tag
+                       Examples: Example with 1 tag
+                         | foo |
+                       @tag @tag
+                       Examples: Example with 2 tags
+                         | foo |
+                       @tag @tag @tag
+                       Examples: Example with 3 tags
+                         | foo |'
+          gs = CQL::Repository.new(CukeModeler::Feature.new(gherkin))
+
+          result = gs.query do
+            select name
+            from examples
+            with tc eq 2
+          end
+
+          expect(result).to eq([{'name' => 'Example with 2 tags'}])
+        end
+
+      end
+
+    end
+
+    describe 'line count' do
+
+      describe 'equality' do
+
+        it 'correctly filters backgrounds' do
+          feature_1 = CukeModeler::Feature.new('Feature:
+                                                  Background: Background with 1 step
+                                                    * a step')
+          feature_2 = CukeModeler::Feature.new('Feature:
+                                                  Background: Background with 2 steps
+                                                    * a step
+                                                    * a step')
+          feature_3 = CukeModeler::Feature.new('Feature:
+                                                  Background: Background with 3 steps
+                                                    * a step
+                                                    * a step
+                                                    * a step')
+          gs = CQL::Repository.new(directory_with(feature_1, feature_2, feature_3))
+
+          result = gs.query do
+            select name
+            from backgrounds
+            with lc eq 2
+          end
+
+          expect(result).to eq([{'name' => 'Background with 2 steps'}])
+        end
+
+        it 'correctly filters scenarios' do
+          gherkin = 'Feature:
+                       Scenario: Test with 1 step
+                         * a step
+                       Scenario: Test with 2 steps
+                         * a step
+                         * a step
+                       Scenario: Test with 3 steps
+                        * a step
+                        * a step
+                        * a step'
+          gs = CQL::Repository.new(CukeModeler::Feature.new(gherkin))
+
+          result = gs.query do
+            select name
+            from scenarios
+            with lc eq 2
+          end
+
+          expect(result).to eq([{'name' => 'Test with 2 steps'}])
+        end
+
+        it 'correctly filters outlines' do
+          gherkin = 'Feature:
+                       Scenario Outline: Test with 1 step
+                         * a step
+                       Scenario Outline: Test with 2 steps
+                         * a step
+                         * a step
+                       Scenario Outline: Test with 3 steps
+                         * a step
+                         * a step
+                         * a step'
+          gs = CQL::Repository.new(CukeModeler::Feature.new(gherkin))
+
+          result = gs.query do
+            select name
+            from outlines
+            with lc eq 2
+          end
+
+          expect(result).to eq([{'name' => 'Test with 2 steps'}])
+        end
+
+      end
+
+    end
+
+    describe 'scenario count' do
+
+      describe 'equality' do
+
+        it 'correctly filters features' do
+          feature_1 = CukeModeler::Feature.new('Feature: Feature with 1 scenario
+                                                  Scenario:')
+          feature_2 = CukeModeler::Feature.new('Feature: Feature with 2 scenarios
+                                                  Scenario:
+                                                  Scenario:')
+          feature_3 = CukeModeler::Feature.new('Feature: Feature with 3 scenarios
+                                                  Scenario:
+                                                  Scenario:
+                                                  Scenario:')
+          gs = CQL::Repository.new(directory_with(feature_1, feature_2, feature_3))
+
+          result = gs.query do
+            select name
+            from features
+            with sc eq 2
+          end
+
+          expect(result).to eq([{'name' => 'Feature with 2 scenarios'}])
+        end
+
+      end
+
+    end
+
+    describe 'outline count' do
+
+      describe 'equality' do
+
+        it 'correctly filters features' do
+          feature_1 = CukeModeler::Feature.new('Feature: Feature with 1 outline
+                                                  Scenario Outline:
+                                                    * a step')
+          feature_2 = CukeModeler::Feature.new('Feature: Feature with 2 outlines
+                                                  Scenario Outline:
+                                                    * a step
+                                                  Scenario Outline:
+                                                    * a step')
+          feature_3 = CukeModeler::Feature.new('Feature: Feature with 3 outlines
+                                                  Scenario Outline:
+                                                    * a step
+                                                  Scenario Outline:
+                                                    * a step
+                                                  Scenario Outline:
+                                                    * a step')
+          gs = CQL::Repository.new(directory_with(feature_1, feature_2, feature_3))
+
+          result = gs.query do
+            select name
+            from features
+            with soc eq 2
+          end
+
+          expect(result).to eq([{'name' => 'Feature with 2 outlines'}])
+        end
+
+      end
+
+    end
+
+    describe 'scenario and outline count' do
+
+      describe 'equality' do
+
+        it 'correctly filters features' do
+          feature_1 = CukeModeler::Feature.new('Feature: Feature with 1 test
+                                                  Scenario:')
+          feature_2 = CukeModeler::Feature.new('Feature: Feature with 2 tests
+                                                  Scenario:
+                                                  Scenario Outline:
+                                                    * a step')
+          feature_3 = CukeModeler::Feature.new('Feature: Feature with 3 tests
+                                                  Scenario:
+                                                  Scenario Outline:
+                                                    * a step
+                                                  Scenario:')
+          gs = CQL::Repository.new(directory_with(feature_1, feature_2, feature_3))
+
+          result = gs.query do
+            select name
+            from features
+            with ssoc eq 2
+          end
+
+          expect(result).to eq([{'name' => 'Feature with 2 tests'}])
+        end
+
+      end
+
+    end
+
+  end
+
+end