watir-or 0.0.2 → 0.0.3

data/lib/watir-or/element.rb

@@ -7,6 +7,7 @@ module ObjectRepository
       @id = id
       @description = description
       @type = type
+      normalize_whats!(whats)
       @locator = Hash[*hows.zip(whats).flatten]
     end
 
@@ -17,6 +18,14 @@ module ObjectRepository
     def ==(other)
       @id == other.id && @type == other.type && @description == other.description && @locator == other.locator
     end
+
+    private
+
+    def normalize_whats!(whats)
+      whats.map! do |what|
+        what =~ /^\/(.*)\/$/ ? what = Regexp.new($1) : what
+      end
+    end
   end
 
   class CustomElement

data/lib/watir-or/readers/xls.rb

@@ -7,7 +7,7 @@ module ObjectRepository
         if options.nil?
           read_worksheet(Spreadsheet.open(file).worksheet(0), &block)
         elsif options[:worksheet].is_a?(String)
-          read_worksheet(Spreadsheet.open(file).worksheet(options[:tab]), &block)
+          read_worksheet(Spreadsheet.open(file).worksheet(options[:worksheet]), &block)
         elsif options[:worksheet] == :all
           Spreadsheet.open(file).worksheets.each { |worksheet|
             read_worksheet(worksheet, &block)

data/spec/read_xls_spec.rb

@@ -27,7 +27,7 @@ describe "Read xls-repository" do
 
   context "Read special worksheet" do
     before(:all) do
-      @repository = ObjectRepository::Repository.new("spec/test.xls", nil, :tab => "special worksheet")
+      @repository = ObjectRepository::Repository.new("spec/test.xls", nil, :worksheet => "special worksheet")
     end
 
     it "should read element on special workheet" do
@@ -39,7 +39,7 @@ describe "Read xls-repository" do
 
   context "Read all worksheets" do
     before(:all) do
-      @repository = ObjectRepository::Repository.new("spec/test.xls", nil, :tab => :all)
+      @repository = ObjectRepository::Repository.new("spec/test.xls", nil, :worksheet => :all)
     end
 
     it "should read all elements on all workheets" do

data/spec/watir_builder_spec.rb

@@ -13,15 +13,23 @@ describe "WatirConverter" do
     built.should == 'select_list(:index=>1, :text=>"test text")'
   end
 
-  it "build watir object which has one parent" do
-    element = @repository.elements.find {|el| el.id == "with parent"}
+  it "build element with regexp" do
+    element = @repository.elements.find {|el| el.id == "with regexp what"}
     built = ObjectRepository::ElementConverter::Watir.build_element(element, @repository)
-    built.should == 'div(:index,1).div(:index,3)'
+    built.should == 'text_field(:text,/regexp/)'
   end
 
-  it "2 level hierarchy" do
-    element = @repository.elements.find {|el| el.id == "2 level hierarchy"}
-    built = ObjectRepository::ElementConverter::Watir.build_element(element, @repository)
-    built.should == 'div(:index,1).div(:index,3).div(:index,5)'
+  context "hierarchy" do
+    it "watir object which has one parent" do
+      element = @repository.elements.find {|el| el.id == "with parent"}
+      built = ObjectRepository::ElementConverter::Watir.build_element(element, @repository)
+      built.should == 'div(:index,1).div(:index,3)'
+    end
+
+    it "2 level" do
+      element = @repository.elements.find {|el| el.id == "2 level hierarchy"}
+      built = ObjectRepository::ElementConverter::Watir.build_element(element, @repository)
+      built.should == 'div(:index,1).div(:index,3).div(:index,5)'
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ivan Kabluchkov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 +04:00
+date: 2010-10-17 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency