test-factory 0.2.1 → 0.2.2

data/lib/test-factory/data_factory.rb

@@ -13,16 +13,32 @@ module DataFactory
   alias update_options set_options
 
   # Items passed to this method are checked to ensure that the associated class instance variable
-  # is not nil. If it is, the script is aborted and an error is thrown.
+  # is not nil. If it is, the script is aborted and an error is thrown. Use symbols separated
+  # by commas with this method. The symbol(s) should exactly match the name of the instance
+  # variable that must not be empty.
+  #
+  # NOTE: Currently this is backwards compatible with prior versions, which took the instance
+  # variables directly in the parameter. This backwards compatibility will be removed in
+  # some future update of the gem.
+  #
   # @param elements [Array] the list of items that are required.
   #
   # @example
   #
-  #   requires @site, @assignment
+  #   requires :site, :assignment, :document_id
   #
   def requires(*elements)
     elements.each do |inst_var|
-      raise "You've neglected to define a required variable for the #{self}." if inst_var==nil
+      if inst_var.kind_of? Symbol
+        string="@#{inst_var.to_s}"
+        if instance_variable_get(string)==nil
+          raise "You've neglected to define a required variable for your #{self.class}.\n\nPlease ensure you always specify a value for #{string} when you create the data object."
+        end
+      elsif inst_var.kind_of? String
+        warn "<<<<WARNING!>>>>\n\nPlease update the requires method in your\n#{self.class} class to refer to symbols\ninstead of directly referencing the class'\ninstance variables.\n\n  Example:\n\n    This...\n      requires @document_id\n    Should be updated to...\n      requires :document_id\n\nIn future versions of TestFactory the 'requires'\nmethod will only support symbolized references\nto the instance variables. The backwards\ncompatibility will be removed.\n\n<<<<WARNING!>>>>"
+      elsif inst_var==nil
+        raise "You've neglected to define a required variable for your #{self.class}.\n\n<<<<WARNING!>>>>\n\nPlease update the requires method in your #{self} class to refer to symbols\ninstead of directly referencing the class'\ninstance variables.\n\nIn future versions of TestFactory the 'requires' method\nwill only support symbolized references\nto the instance variables. The backwards\ncompatibility will be removed.\n\n<<<<WARNING!>>>>"
+      end
     end
   end
 

data/lib/test-factory/gem_ext.rb

@@ -145,7 +145,9 @@ module Watir
     # setting the associated class instance variable
     # with it, like so...
     # @example
+    #   @my_selection=:random
     #   @my_selection=page.select_list.pick @my_selection
+    #   puts @my_selection # => <Value of randomly selected item from list>
     #
     def pick(item)
       if item==:random
@@ -161,10 +163,10 @@ module Watir
     def select_at_random
       text_array = []
       options.each { |opt| text_array << opt.text }
-      text_array.delete_if { |text| text=="select" }
-      text_array.shuffle!
-      select text_array[0]
-      text_array[0]
+      text_array.delete_if { |text| text=="select" || text=="" }
+      item = text_array.sample
+      select item
+      item
     end
 
   end

data/lib/test-factory/page_factory.rb

@@ -119,6 +119,7 @@ class PageFactory
       action(damballa(button_text)) { |b| b.button(:value=>button_text).click }
     end
 
+    private
     # A helper method that converts the passed string into snake case. See the StringFactory
     # module for more info.
     #

data/test-factory.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'test-factory'
-  s.version = '0.2.1'
+  s.version = '0.2.2'
   s.summary = %q{rSmart's framework for creating automated testing scripts}
   s.description = %q{This gem provides a set of modules and methods to help quickly and DRYly create a test automation framework using Ruby and Watir (or watir-webdriver).}
   s.files = Dir.glob("**/**/**")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-factory
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver