cql 1.4.0 → 1.6.0

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

@@ -2,18 +2,20 @@ Feature: 'select' clause
 
   The *select* clause specifies what attributes will be retrieved from the models specified by the *from* clause. Multiple values can be given and they are delimited by a comma. The *select* clause can take any method to which the objects specified by *from* know how to respond. The clause can also be given a special identifier in order to return the underlying models themselves instead of their attributes. If no attributes are specified then the underlying model will be returned instead, just as if the special identifier had been used (it is simply an alternate syntax and may look nicer in some queries).
 
-    Sample usage:
-      cql_repo.query do
-        select name, tags, description_text
-        from features
-      end
+  Sample usage:
+  ````
+  cql_repo.query do
+    select name, tags, description_text
+    from features
+  end
+  ````
 
   This clause can be repeated multiple times. The arguments for successive clauses are simply added to the previous arguments.
 
 
-  Background: A sample Cucumber suite
-    Given a directory "test_directory"
-    And a file "test_directory/test_file_1.feature":
+  Background: Repository with models
+    Given a repository to query
+    And the following feature has been modeled in the repository:
       """
       Feature: A test feature
 
@@ -33,7 +35,6 @@ Feature: 'select' clause
           | param |
           | value |
       """
-    And a repository is made from "test_directory"
 
 
   Scenario: Using 'select' to specify which attributes of an object to return
@@ -91,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
@@ -115,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

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

@@ -2,20 +2,22 @@ Feature: 'transform' clause
 
   The *transform* clause allows you to change the values of the attributes specified by the *select* clause after they are gathered. Value transforming can be done as a list of transformation blocks that are applied in order or as a mapping of specific keys and their transformations.
 
-    Sample usage:
-      cql_repo.query do
-        select name
-        transform { |name| name.upcase }
-        from features
-      end
+  Sample usage:
+  ````
+  cql_repo.query do
+    select name
+    transform { |name| name.upcase }
+    from features
+  end
+  ````
 
   This will return a list of all of the feature names but with all of their names upcased.
 
   This clause can be repeated multiple times. When using lists of transforms, the arguments for successive clauses are simply added to the previous arguments. When using mapped transforms, the mappings are likewise combined. If the same key is mapped more than once, the mappings are tracked separately such that they can be applied to different instances of attribute retrieval (see examples below).
 
   Background: A sample Cucumber suite
-    Given a directory "test_directory"
-    And a file "test_directory/test_file_1.feature":
+    Given a repository to query
+    And the following feature has been modeled in the repository:
       """
       Feature: A test feature
 
@@ -35,7 +37,6 @@ Feature: 'transform' clause
           | param |
           | value |
       """
-    And a repository is made from "test_directory"
 
 
   Scenario: Using 'transform' to change values after they are gathered

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

@@ -1,47 +1,20 @@
 # 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
 
-  The *with* clause specifies filter conditions that will reduce the number of things targeted by the *from* clause. The *with* clause can take one or more blocks that will filter out any object for which the block does not evaluate to true (using 'without' instead of 'with' will have the opposite effect). Alternatively, mappings of specific *from* targets to their respective filtering blocks can be provided. The *with* clause can also take predefined filters (detailed below).
+  The *with* clause specifies filter conditions that will reduce the number of things targeted by the *from* clause. The *with* clause can take one or more blocks that will filter out any object for which the block does not evaluate to true (using 'without' instead of 'with' will have the opposite effect). Alternatively, mappings of specific *from* targets to their respective filtering blocks can be provided. The *with* clause can also take predefined filters (see corresponding documentation).
 
-    Sample usage:
-      cql_repo.query do
-        select name, tags, description_text
-        from features
-        with { |feature| feature.name =~ /foo/ }
-        with tc lt 3
-      end
+  Sample usage:
+  ````
+  cql_repo.query do
+    select name, tags, description_text
+    from features
+    with { |feature| feature.name =~ /foo/ }
+  end
+  ````
 
   This clause can be repeated multiple times. The arguments for successive clauses are simply added to the previous arguments.
 
 
-  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)
-
-
   Background: A sample Cucumber suite
     Given a repository to query
     And the following feature has been modeled in the repository:
@@ -159,7 +132,7 @@ Feature: 'with' clause
       """
       select name
       from features, scenarios
-      with scenarios => tags('@tag_1','@tag_2')
+      with scenarios => lambda { |element| element.name == 'Test 1' }
       """
     Then the following values are returned:
       | name                             |
@@ -214,127 +187,6 @@ Feature: 'with' clause
       | A feature with lots of scenarios |
       | A feature with lots of outlines  |
 
-# todo - break out the predefined filters into another feature file?
-  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
-    When the following query is executed:
-      """
-      select name
-      from scenarios, outlines
-      with name 'Test 3'
-      """
-    Then the following values are returned:
-      | name   |
-      | Test 3 |
-    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
-    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 |
-    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 1
-      """
-    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 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 |
-
-  @wip
-  Scenario: Using the 'lt' count filter
-
-  @wip
-  Scenario: Using the 'lte' count filter
-
-  @wip
-  Scenario: Using the 'gt' count filter
-
-  @wip
-  Scenario: Using the 'gte' count filter
-
   Scenario: Using 'without' for negation
     When the following query is executed:
       """
@@ -348,15 +200,3 @@ Feature: 'with' clause
       from scenarios
       with { |scenario| !(scenario.source_line == 8) }
       """
-    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
-      """

data/testing/cucumber/features/dsl.feature

@@ -2,22 +2,25 @@ Feature: DSL
 
   The cql gem uses a DSL to specify queries on a repository object that holds the models which represent a Cucumber test suite. The DSL can query for any attribute that is available on the underlying models.
 
-    Sample usage:
-      cql_repo.query do
-        select name, source_line
-        from features
-      end
+  Sample usage:
+  ````
+  cql_repo.query do
+    select name, source_line
+    from features
+  end
+  ````
 
   Query results are returned as a list of attribute mappings for all of the models found in the repository. The sample query above might return:
 
-    [{'name' => 'Feature 1', 'source_line' => 1},
-    {'name' => 'Feature 2', 'source_line' => 3},
-    {'name' => 'Feature 3', 'source_line' => 10}]
-
+  ````
+  [{'name' => 'Feature 1', 'source_line' => 1},
+  {'name' => 'Feature 2', 'source_line' => 3},
+  {'name' => 'Feature 3', 'source_line' => 10}]
+  ````
 
   Background: A sample Cucumber suite
-    Given a directory "test_directory"
-    And a file "test_directory/test_file_1.feature":
+    Given a repository to query
+    And the following feature has been modeled in the repository:
       """
       Feature: A test feature
 
@@ -37,7 +40,7 @@ Feature: DSL
           | param |
           | value |
       """
-    And a repository is made from "test_directory"
+
 
   Scenario: Automatic string conversion
 
@@ -53,25 +56,3 @@ Feature: DSL
       select 'name'
       from 'scenarios'
       """
-
-
-# Commented out so that they aren't picked up by Relish
-#
-#  @wip
-#  Scenario: Use 'order_by' to sort the results
-#
-#  # 'and' is a keyword. Some other kind of repeater word would be needed
-#  @wip
-#  Scenario: 'And' can be used instead of repeating the previous keyword
-#    When the following query is executed:
-#      """
-#      select 'name'
-#      and    'source_line'
-#      from CukeModeler::Scenario
-#      and  CukeModeler::Outline
-#      """
-#    Then the following values are returned:
-#      | name   | source_line |
-#      | Test 1 | 3           |
-#      | Test 2 | 6           |
-#      | Test 3 | 9           |

data/testing/cucumber/step_definitions/setup_steps.rb

@@ -1,17 +1,5 @@
 Given(/^a directory "([^"]*)"$/) do |partial_directory_path|
-  directory_path = partial_directory_path.include?('path/to') ? process_path(partial_directory_path) : "#{@default_file_directory}/#{partial_directory_path}"
-
-  FileUtils.mkpath(directory_path) unless File.exists?(directory_path)
-end
-
-And(/^a file "([^"]*)":$/) do |partial_file_path, file_text|
-  File.open("#{@default_file_directory}/#{partial_file_path}", 'w') { |file| file.write file_text }
-end
-
-And(/^a repository is made from "([^"]*)"$/) do |partial_path|
-  repo_path = "#{@default_file_directory}/#{partial_path}"
-
-  @repository = CQL::Repository.new(repo_path)
+  create_path(partial_directory_path)
 end
 
 Given(/^the models provided by CukeModeler$/) do

data/testing/cucumber/step_definitions/verification_steps.rb

@@ -2,16 +2,15 @@ Then(/^the following values are returned:$/) do |values|
   expected_keys = values.raw.first
   expected_results = values.hashes
 
+  # Protecting against false positives
+  # Key order doesn't matter and Ruby 1.8.7 does not retain hash key ordering, so sorting them for consistency
+  raise('Invalid result set. Attribute names cannot be repeated.') unless expected_keys.sort == expected_results.first.keys.sort
+
   expected_results.each do |result|
     result.each_pair { |key, value| result[key] = value.to_i if value =~ /^\d+$/ }
   end
 
-
-  @query_results.each_with_index do |result, index|
-    # Key order doesn't matter and Ruby 1.8.7 does not retain hash key ordering, so sorting them for consistency
-    expect(result.keys.sort).to eq(expected_keys.sort)
-    expect(result).to eq(expected_results[index])
-  end
+  expect(@query_results).to match_array(expected_results)
 end
 
 # Then(/^all of them can be queried for additional information$/) do
@@ -41,7 +40,7 @@ Then(/^the result is the same as the result of the following query:$/) do |query
 end
 
 Then(/^the following code executes without error:$/) do |code_text|
-  code_text = process_path(code_text)
+  code_text.sub!('path/to', @temp_dir)
 
   expect { eval(code_text) }.to_not raise_error
 end

data/testing/cucumber/support/env.rb

@@ -3,22 +3,22 @@ unless RUBY_VERSION.to_s < '1.9.0'
   SimpleCov.command_name('cql-cucumber')
 end
 
+require 'tmpdir'
 
 require 'cql'
 require 'cql/model_dsl'
 
 
-Before do
-  @default_file_directory = "#{File.dirname(__FILE__)}/../temp_files"
-
-  FileUtils.mkdir(@default_file_directory)
-end
-
 After do
-  FileUtils.remove_dir(@default_file_directory, true)
+  FileUtils.remove_dir(@temp_dir, true) if @temp_dir
 end
 
 
-def process_path(path)
-  path.sub('path/to', @default_file_directory)
+def create_path(path)
+  @temp_dir ||= Dir.mktmpdir
+  path = path.sub('path/to/', "#{@temp_dir}/")
+
+  Dir.mkdir(path)
+
+  path
 end