cql 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 480c8624435a5cb099bdff3beed45bd86cf8e885
-  data.tar.gz: 9dac6f20b35222fbdf438ea06e1f4e1e7aba111b
+  metadata.gz: c1a6431920afce8b5bb22168816f947c7754873d
+  data.tar.gz: 52a8f8287a9ae24f702ccbd7f511689a058ee962
 SHA512:
-  metadata.gz: 459be59da7ad0eb4d0fbd2f25eef00890c054e5a694f5f8f8406f7cc7474602d527ffb63de68c903bb9aef271336ee317484b5dce620c4f67b2c0d2e70fa5128
-  data.tar.gz: 29eacad72952a06a4395c9675979c32d243408b564f59070cf5adda1e264783122922e1cf248c5e1b980b93e9bfdb7328eaeda0ed5c9d7cae36c6df65403f6d0
+  metadata.gz: e86ebe5acdb55af2cb9bf1d9012e5a3046ccfd7d45a9c402b03e710e1f0f8f7289b10ab12b28d8ac4306fdaacb666d4001e793560b6064aa736050a5b44857dc
+  data.tar.gz: e60182bd6a14971947a91a1a5a364835665a8ee2764a4eab5e1708834379e51a9d370593dce21b91be3f549a813a8b506172142fbc96b26d32105defeb396fb6

data/lib/cql/dsl.rb

@@ -134,6 +134,11 @@ module CQL
       Comparison.new '<=', amount
     end
 
+    # Adds an *eq* filter operator to the query. See the corresponding Cucumber documentation for details.
+    def eq amount
+      Comparison.new '==', amount
+    end
+
     # Adds a *tags* filter to the query. See the corresponding Cucumber documentation for details.
     def tags *tags
       return "tags" if tags.size == 0

data/lib/cql/version.rb

@@ -1,4 +1,4 @@
 module CQL
   # The current version of the gem
-  VERSION = '1.4.2'
+  VERSION = '1.5.0'
 end

data/testing/cucumber/features/clauses/from_clause.feature

@@ -119,11 +119,3 @@ Feature: 'from' clause
       from :all
       """
     Then all models are queried from
-
-
-# Commented out so that they aren't picked up by Relish
-#  @wip
-#  Scenario: Can 'from' from all type of model
-#
-#  @wip
-#  Scenario: From-ing from a collection

data/testing/cucumber/features/clauses/predefined_with_filters.feature

@@ -0,0 +1,392 @@
+# todo - Rewrite the scenarios such that they use their own test specific feature files instead of setting up a large suite in the background
+Feature: 'with' clause
+
+  There are several predefined filters that can be used with the *with* clause. Like regular 'block style' conditions, they can be negated using *without*, used in a targeted fashion, etc.
+
+  Sample usage:
+  ````
+  cql_repo.query do
+  select name, tags, description_text
+  from features
+  with tc lt 3
+  end
+  ````
+
+  The following filters are supported for models that have tags:
+
+  * tags - Filters out models that do not have the exact set of tags provided.
+  * tc   - (tag count) Filters out models based on the number of tags that they have.
+
+  The following filters are supported for models that have names:
+
+  * name - Filters out models whose name does not match the name provided. Can be a string or regular expression.
+
+  The following filters are supported for models that have steps:
+
+  * line - Filters out models whose steps do not include the provided step (keywords and blocks are ignored). Can be a string or regular expression.
+  * lc   - (line count) Filters out models based on the number of steps that they have.
+
+  The following filters are supported for feature models:
+
+  * sc   - (scenario count) Filters out models based on the number of scenarios that they have.
+  * soc  - (scenario outline count) Filters out models based on the number of outlines that they have.
+  * ssoc - (scenario and scenario outline count) Filters out models based on the total number of scenarios and outlines that they have.
+
+  For count based filters, the following operators are available:
+
+  * lt   (Less than)
+  * lte  (Less than or equals)
+  * gt   (Greater than)
+  * gte  (Greater than or equals)
+  * eq   (Equals)
+
+
+  Background: A sample Cucumber suite
+    Given a repository to query
+    And the following feature has been modeled in the repository:
+      """
+      Feature: A test feature
+
+        @tag_1 @tag_2
+        Scenario: Test 1
+          * some steps
+
+        @special_tag @tag_2
+        Scenario: Test 2
+          * some other steps
+          * some other steps
+          * some other steps
+
+        @a @b @c
+        Scenario Outline: Test 3
+          * some steps
+          * some more steps
+          * some more steps
+          * some more steps
+        Examples: First examples
+          | param |
+          | value |
+        Examples: Second examples
+          | param |
+          | value |
+
+        Scenario: Test 4
+      """
+    And the following feature has been modeled in the repository:
+      """
+      Feature: A feature with lots of scenarios
+
+        Scenario: 1
+          * different steps
+          * different steps
+
+        Scenario: 2
+          * different steps
+          * different steps
+
+        Scenario: 3
+          * different steps
+          * different steps
+      """
+    And the following feature has been modeled in the repository:
+      """
+      Feature: A feature with lots of outlines
+
+        Scenario Outline: 1
+          * different steps
+          * different steps
+        Examples:
+          | param |
+          | value |
+
+        Scenario Outline: 2
+          * different steps
+          * different steps
+        Examples:
+          | param |
+          | value |
+
+        Scenario Outline: 3
+          * different steps
+          * different steps
+        Examples:
+          | param |
+          | value |
+      """
+    And the following feature has been modeled in the repository:
+      """
+      Feature: A feature with a mix of tests
+
+        Scenario: 4
+          * different steps
+          * different steps
+
+        Scenario Outline: 4
+          * different steps
+          * different steps
+        Examples:
+          | param |
+          | value |
+      """
+
+
+  Scenario: Filtering by tags
+    When the following query is executed:
+      """
+      select name
+      from scenarios
+      with tags '@tag_1', '@tag_2'
+      """
+    Then the following values are returned:
+      | name   |
+      | Test 1 |
+
+  Scenario: Filtering by tag count
+    When the following query is executed:
+      """
+      select name
+      from scenarios, outlines
+      with tc gt 2
+      """
+    Then the following values are returned:
+      | name   |
+      | Test 3 |
+
+  Scenario: Filtering by name (exact match)
+    When the following query is executed:
+      """
+      select name
+      from scenarios, outlines
+      with name 'Test 3'
+      """
+    Then the following values are returned:
+      | name   |
+      | Test 3 |
+
+  Scenario: Filtering by name (regular expression)
+    When the following query is executed:
+      """
+      select name
+      from scenarios, outlines
+      with name /Test [12]/
+      """
+    Then the following values are returned:
+      | name   |
+      | Test 1 |
+      | Test 2 |
+
+  Scenario: Filtering by line (exact match)
+    When the following query is executed:
+      """
+      select name
+      from scenarios, outlines
+      with line 'some steps'
+      """
+    Then the following values are returned:
+      | name   |
+      | Test 1 |
+      | Test 3 |
+
+  Scenario: Filtering by line (regular expression)
+    When the following query is executed:
+      """
+      select name
+      from scenarios, outlines
+      with line /other/
+      """
+    Then the following values are returned:
+      | name   |
+      | Test 2 |
+
+  Scenario: Filtering by line count
+    When the following query is executed:
+      """
+      select name
+      from scenarios, outlines
+      with lc gt 3
+      """
+    Then the following values are returned:
+      | name   |
+      | Test 3 |
+
+  Scenario: Filtering by scenario count
+    When the following query is executed:
+      """
+      select name
+      from features
+      with sc gt 2
+      """
+    Then the following values are returned:
+      | name                             |
+      | A test feature                   |
+      | A feature with lots of scenarios |
+
+  Scenario: Filtering by outline count
+    When the following query is executed:
+      """
+      select name
+      from features
+      with soc gt 2
+      """
+    Then the following values are returned:
+      | name                            |
+      | A feature with lots of outlines |
+
+  Scenario: Filtering by combined test count
+    When the following query is executed:
+      """
+      select name
+      from features
+      with ssoc lt 3
+      """
+    Then the following values are returned:
+      | name                          |
+      | A feature with a mix of tests |
+
+  Scenario: Using the 'lt' count filter
+    When the following query is executed:
+      """
+      select name
+      from features
+      with ssoc lt 3
+      """
+    Then the following values are returned:
+      | name                          |
+      | A feature with a mix of tests |
+
+  Scenario: Using the 'lte' count filter
+    When the following query is executed:
+      """
+      select name
+      from scenarios, outlines
+      with lc lte 1
+      """
+    Then the following values are returned:
+      | name   |
+      | Test 1 |
+      | Test 4 |
+
+  Scenario: Using the 'gt' count filter
+    When the following query is executed:
+      """
+      select name
+      from scenarios, outlines
+      with lc gt 3
+      """
+    Then the following values are returned:
+      | name   |
+      | Test 3 |
+
+  Scenario: Using the 'gte' count filter
+    When the following query is executed:
+      """
+      select name
+      from scenarios, outlines
+      with lc gte 3
+      """
+    Then the following values are returned:
+      | name   |
+      | Test 2 |
+      | Test 3 |
+
+  Scenario: Using the 'eq' count filter
+    When the following query is executed:
+      """
+      select name
+      from scenarios, outlines
+      with tc eq 3
+      """
+    Then the following values are returned:
+      | name   |
+      | Test 3 |
+
+
+  Scenario: Using multiple filters
+    When the following query is executed:
+      """
+      select name
+      from scenarios
+      with tc eq 2
+      with lc gt 1
+      """
+    Then the following values are returned:
+      | name   |
+      | Test 2 |
+
+  Scenario: Using the 'with' clause multiple times
+
+  Behavior is the same as combining regular, block style filters but the syntax has to become more explicit.
+
+    When the following query is executed:
+      """
+      select name
+      from scenarios
+      with tc(eq(2)),
+           lc(gt(1))
+      """
+    Then the result is the same as the result of the following query:
+      """
+      select name
+      from scenarios
+      with tc eq 2
+      with lc gt 1
+      """
+
+  Scenario: Selectively filtering models
+    When the following query is executed:
+      """
+      select name
+      from scenarios, features
+      with scenarios => lc(eq(1))
+      """
+    Then the following values are returned:
+      | name                             |
+      | Test 1                           |
+      | A test feature                   |
+      | A feature with lots of scenarios |
+      | A feature with lots of outlines  |
+      | A feature with a mix of tests    |
+
+
+  Scenario: Mixing targeted and blanket filters
+    When the following query is executed:
+      """
+      select name
+      from scenarios, features
+      with name /test/i
+      with scenarios => tc(eq(0))
+      """
+    Then the following values are returned:
+      | name                          |
+      | Test 4                        |
+      | A test feature                |
+      | A feature with a mix of tests |
+
+  Scenario: Using 'without' for negation
+    When the following query is executed:
+      """
+      select name
+      from features
+      without ssoc lt 3
+      """
+    Then the result is the same as the result of the following query:
+      """
+      select name
+      from features
+      with ssoc gt 2
+      """
+
+  Scenario: Mixing predefined filters and regular filters
+    When the following query is executed:
+      """
+      select name
+      from scenarios, features
+      with { |element| element.name =~ /test/i }
+      with scenarios => tc(eq(0))
+      """
+    Then the following values are returned:
+      | name                          |
+      | Test 4                        |
+      | A test feature                |
+      | A feature with a mix of tests |
+

data/testing/cucumber/features/clauses/select_clause.feature

@@ -92,7 +92,7 @@ Feature: 'select' clause
       from scenarios
       """
 
-  Scenario: Repetitive selection
+  Scenario: Using the 'select' clause multiple times
     When the following query is executed:
       """
       select name
@@ -116,7 +116,3 @@ Feature: 'select' clause
       select :self
       from scenarios
       """
-
-# Commented out so that they aren't picked up by Relish
-#  @wip
-#  Scenario: Can select from all types of model