mattscilipoti-model_steps 0.2.0 → 0.2.2

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "mattscilipoti-model_steps"
     gem.summary = %Q{Model Steps for cucumber}
-    gem.description = %Q{Model Steps for cucumber}
+    gem.description = %Q{Step Definitions for cucumber which support ActiveRecord Models}
     gem.email = "matt@scilipoti.name"
     gem.homepage = "http://github.com/mattscilipoti/mattscilipoti-model_steps"
     gem.authors = ["Matt Scilipoti"]

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.2

data/lib/model_steps/step_definitions.rb

@@ -1,6 +1,6 @@
 Cucumber::Ast::Table.class_eval do
   def is_date_column?(column_name)
-    column_name.columnify =~ /( at|_at|time|date)$/
+    column_name.columnify =~ /( at|_at|time|date)$/i
   end
 
   def chronic_parsable_columns
@@ -55,7 +55,7 @@ Then /^I should see (\d+) (\D+)$/ do |expected_count, requested_model|
 
 end
 
-Then /^I should see (?:these|the following) (\D+):$/ do |requested_model, table|
+Then /^I should see (?:these|this|the following) (\D+):$/ do |requested_model, table|
   # table is a Cucumber::Ast::Table
   table.map_chronic_columns!
   #WORKAROUND: why does table.diff! expect Trouble to be nil (vs. '')?
@@ -76,7 +76,7 @@ end
 #Given the following Camera Events exist:
 #Note: use ((?!.*should) to avoid conflicts with
 #  Given the following Camera Events should exist:
-Given /^(?:these|the following) (?!.*should)(.+) exist:$/ do |requested_model, table|
+Given /^(?:these|this|the following) (?!.*should)(.+) exist:$/ do |requested_model, table|
 
   # table is a Cucumber::Ast::Table
   model = requested_model_to_model(requested_model)
@@ -89,16 +89,7 @@ Given /^(?:these|the following) (?!.*should)(.+) exist:$/ do |requested_model, t
 
     model_params = requested_params_to_model_params(requested_params, model)
 
-    model_under_test = Factory.create(model_to_factory_symbol(model.name), model_params)
-
-    if model_under_test.is_a?(ImportSession)
-      Traffipax.deprecated("special fixture code for 'the following Import Sessions exist'", 'only until ImportSession no longer has ImportSteps') unless ImportSession.new.respond_to?('import_steps')
-      trouble = model_params[:trouble]
-      #ensure last step has proper status
-      #TODO: this is a smell.  We are bypassing proper operation.  Is this test appropriate?
-      model_under_test.current_step.update_attributes!(:started_at => model_under_test.started_at, :completed_at => model_under_test.completed_at)
-      model_under_test.current_step.trouble = trouble if trouble
-    end
+    model_under_test = Factory.create(model_to_factory_symbol(requested_model), model_params)
 
     model_under_test
   end
@@ -167,7 +158,7 @@ end
 #Given ModelA has the following existing ModelB's (see table)
 # Finds the ModelB's which match the conditions
 #  And assigns themto ModelA.association
-Given /^(\D+):(.+) has (?:these|the following) existing (\D+):$/ do |requested_model, default_identifier, requested_association_name, table|
+Given /^(\D+):(.+) has (?:these|this|the following) existing (\D+):$/ do |requested_model, default_identifier, requested_association_name, table|
   association_quantity = table.rows.size
 
   map_table_columns!(table)
@@ -366,12 +357,12 @@ end
 #Assumes:
 # * Header = method name
 # * the first column in each row is the default identifier for that row.
-Then /^(?:these|the following) (.+) should exist:$/ do |requested_model, table|
+Then /^(?:these|this|the following) (.+) should exist:$/ do |requested_model, table|
   # table is a Cucumber::Ast::Table
   model_klass = requested_model_to_model(requested_model)
 
   models_to_verify = requested_models(requested_model)
-  assert_models(table, models_to_verify)
+  assert_models(models_to_verify, table)
 end
 
 Then /^there should be (\d*) (.*)$/ do |cnt, requested_model|
@@ -386,17 +377,38 @@ end
 #end
 
 #Then Location:L1 should have the following Pings
+#Or
+#Then Location:L1 should have these attributes
 #Works against actual models (instead of view)
 #Verifies model count and each method in each row.
 #Assumes:
 # * Header = method name
 # * the first column in each row is the default identifier for that row.
-Then /^(\w+):(.+) should have (?:these|the following|this) (.+):$/ do |requested_model, default_identifier, association, table|
+Then /^(\w+):(.+) (?!.not|NOT)should have (?:these|this|the following) (.+):$/ do |requested_model, default_identifier, association, table|
   # table is a Cucumber::Ast::Table
   model_under_test = requested_model_with_identifier_to_model_instance(requested_model, default_identifier)
+  if association == 'attributes'
+    table.hashes.first.each do |attribute, expected_value|
+      model_under_test.send(attribute).to_s.should == expected_value
+    end
+  else
+    associated_models = model_under_test.send(association.underscore)
+    assert_models(associated_models, table)
+  end
+end
 
-  associated_models = model_under_test.send(association.underscore)
-  assert_models(table, associated_models)
+Then /^(\w+):(.+) should (?:not|NOT) have (?:these|this|the following) (.+):$/ do |requested_model, default_identifier, association, table|
+  # table is a Cucumber::Ast::Table
+  model_under_test = requested_model_with_identifier_to_model_instance(requested_model, default_identifier)
+
+  if association == 'attributes'
+    table.hashes.first.each do |attribute, expected_value|
+      model_under_test.send(attribute).to_s.should_not == expected_value
+    end
+  else
+    associated_models = model_under_test.send(association.underscore)
+    assert_models(associated_models, table, :should_not)
+  end
 end
 
 #Then ModelA should have 1 ModelB
@@ -416,13 +428,16 @@ private
 #Assumes:
 # * Header = method name
 # * the first column in each row is the default identifier for that row.
-def assert_models(table, *expected_models)
-  expected_models.flatten!
-  model_klass = expected_models.first && expected_models.first.class.base_class rescue expected_models.first.class #support non-AR models
+def assert_models(expected_models, table, should_not = false)
+  model_klass = expected_models.first && expected_models.first.class.base_class rescue expected_models.first.class
 
   map_table_columns!(table)
   rows = map_table_headers(table).hashes
-  expected_models.count.should == rows.size
+  if should_not
+    expected_models.count.should_not == rows.size
+  else
+    expected_models.count.should == rows.size
+  end
 
   first_column_name = table.headers[0]
 
@@ -434,26 +449,30 @@ def assert_models(table, *expected_models)
     #find the model for this row
     model_under_test = expected_models.detect {|model| model.send(first_column_name).to_s == default_identifier }
 
-    #compare model with expectations
-    requested_params.each do |attribute_name, expected_value|
-      actual = model_under_test.send(attribute_name)
-      if actual.is_a?(ActiveRecord::Base)
-        #if AR model, compare against value of default_identifier_column
-        actual = actual.send(actual.class.default_identifier_column)
-      end
+    unless should_not
+      model_under_test.should_not be_nil
+    end if
 
-      err_msg = "Expected ##{attribute_name} for '#{model_klass.name}:#{default_identifier}'\n\t  to be: '#{expected_value}'\n\tbut was: '#{actual}'\n * Expectations: #{requested_params.inspect} \n * #{model_klass.name}:#{default_identifier}: #{model_under_test.inspect}.\n\n"
-      if expected_value =~ /[*]/ #has wild card
-        expected_value = expected_value.gsub('*', '.*')
-        actual.to_s.should match(expected_value), err_msg
-      else
-        actual.to_s.should eql(expected_value.to_s), err_msg
+    if model_under_test
+      #compare model with expectations
+      requested_params.each do |attribute_name, expected_value|
+        actual = model_under_test.send(attribute_name)
+        if actual.is_a?(ActiveRecord::Base)
+          actual = actual.send(actual.class.default_identifier_column)
+        end
+        if should_not
+          err_msg = "Expected ##{attribute_name} for '#{model_klass.name}:#{default_identifier}'\n\t  to NOT have: '#{expected_value}'\n\tbut was: '#{actual}'\n * Expectations: #{requested_params.inspect} \n * #{model_klass.name}:#{default_identifier}: #{model_under_test.inspect}.\n\n"
+          actual.to_s.should_not eql(expected_value), err_msg
+        else
+          err_msg = "Expected ##{attribute_name} for '#{model_klass.name}:#{default_identifier}'\n\t  to be: '#{expected_value}'\n\tbut was: '#{actual}'\n * Expectations: #{requested_params.inspect} \n * #{model_klass.name}:#{default_identifier}: #{model_under_test.inspect}.\n\n"
+          actual.to_s.should eql(expected_value), err_msg
+        end
       end
-
     end
   end
 end
 
+
 def requested_model_with_identifier_to_model_instance(requested_model, default_identifier)
   model = requested_model_to_model(requested_model)
   model_under_test = model.find_by_default_identifier!(default_identifier)
@@ -570,7 +589,7 @@ def map_table_header(header)
   #TODO: associations should be underscore'd
 #  mapped_header = header.columnify
   mapped_header = header
-  mapped_header.sub!('#', 'Number')
+#  mapped_header.sub!('#', 'Number')
   case header
     when 'printer'
       mapped_header = 'printer_prefix'
@@ -692,7 +711,7 @@ def requested_params_to_model_params(requested_params, model)
   association_names = model.reflect_on_all_associations.collect &:name
 
   mapped_params = {}
-  requested_params.each {|header, value| mapped_params[header.columnify] = value}
+  requested_params.each {|header, value| mapped_params[header] = value}
 
   association_params = mapped_params.reject { |param_name, value| !association_names.include?(ModelSteps::Inflector.param_to_association_name(param_name)) }
   association_params.each do |param_name, value|

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mattscilipoti-model_steps
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Matt Scilipoti
@@ -9,30 +15,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 -05:00
+date: 2010-05-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: micronaut
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
-description: Model Steps for cucumber
+  type: :development
+  version_requirements: *id002
+description: Step Definitions for cucumber which support ActiveRecord Models
 email: matt@scilipoti.name
 executables: []
 
@@ -65,21 +79,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Model Steps for cucumber