rufus 0.7 → 0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjU3ODRhOWYwMjMxYmQ3MmM2NGZjYWI3YzhhYWYzM2FmZjA3OWZjYw==
+    ZmRlZWRiNzVkYTA5ZWIyNTU1MjhmNWM2OGZjOWE3ZDk3YjNiODhmOA==
   data.tar.gz: !binary |-
-    ZDNhNDZhZDAwMGZmYzllNGU1NTI2NTBkOTRkN2ZmOGFiOTcxYmMyYw==
+    NzQxZWVhZGFiYjI4NGQ3NDllYTdhMjg5OTZkNmQ0Y2ExOTdlZWU3MQ==
 SHA512:
   metadata.gz: !binary |-
-    YzE0OGFjOTMyMzJkOTczZDYzZjU2ZjkzYmFjMDk1NjQ1Y2UyMmY3ZmVkYmY2
-    ZGE1NmYyMGY5MWI4MDNmNDkxZGQ2NDMzODc3NmQyY2M1ZjUxYzEwZmZhNGEy
-    MTgwNjk5NzJjMzVlZDk5ZTA0YjE5OGE0MGVmMGI4NjU5MGJkOTI=
+    MTNhY2NjZWYyZjQyZTIzMGVlNmExMDcxMDRlNTUxNGZjMDlkMDJmNGM0YWI5
+    NjU0MWJlMTFjMDhjYjMxNWM3OTZmNThkY2I5Y2Q0OWE5Y2U4YzQ1OTdiNGRi
+    ZDBmMmM1ZTlkOWM1OWIxOWNiNDAyZmE1MmEyZmZjODdhYjA0MTY=
   data.tar.gz: !binary |-
-    NjYzZjNiNDVhMjc2MTBkNWFkNjBhY2VmNjRhZjI3NGNhMDFkZGUxM2JhYjVm
-    YTg5Zjk4N2I3Njk4MjczMmVjZmY4ZTVhNDkwY2RhNGQzMjkyMWE3OWI5ZDIx
-    NzIwZGE5ZjE5YmE5Y2NkZWI1YmI1YTJiMjQ1NWY3NTI2Y2I1NjQ=
+    NTBlNDhkZGRhMjdkMDM4MWQxM2JlZDgwMmUyMDk4Mzk2NWU5ZWNiMDUyNWJl
+    YzA0MDdlMzQ1OTg4NmRlY2IzNjVmMDMzY2UzZTA2ZmYwOWIyMTYzNDJjNjVj
+    MDkwZDhlMDFhMzAyN2EyODI4OGE5Nzg3ZDgzOTcyYTZiOTA4NWQ=

data/RufusApp/RufusApp/en.lproj/RUViewController.xib

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="4510" systemVersion="12F45" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="4514" systemVersion="12F45" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="RUViewController">
@@ -21,7 +21,7 @@
             <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4">
+                <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4">
                     <rect key="frame" x="270" y="251" width="219" height="30"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="rufusButton"/>
@@ -32,24 +32,13 @@
                         <action selector="toRufusPage:" destination="-1" eventType="touchUpInside" id="12"/>
                     </connections>
                 </button>
-                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="13">
+                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="13">
                     <rect key="frame" x="270" y="209" width="219" height="30"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="rufusTextBox"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <textInputTraits key="textInputTraits"/>
                 </textField>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" misplaced="YES" text="Rufus Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="24">
-                    <rect key="frame" x="324" y="180" width="107" height="21"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <accessibility key="accessibilityConfiguration" label="rufusLabel"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="219" id="31"/>
-                    </constraints>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VTc-fX-2Iw">
                     <rect key="frame" x="304" y="302" width="150" height="30"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -117,6 +106,13 @@
                         <action selector="toTablePage:" destination="-1" eventType="touchUpInside" id="hgd-Rn-c0B"/>
                     </connections>
                 </button>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Rufus Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2aB-zP-NHi">
+                    <rect key="frame" x="333" y="153" width="92" height="21"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
             <constraints>
@@ -124,10 +120,6 @@
                 <constraint firstItem="13" firstAttribute="leading" secondItem="4" secondAttribute="leading" id="17"/>
                 <constraint firstItem="4" firstAttribute="trailing" secondItem="13" secondAttribute="trailing" id="20"/>
                 <constraint firstItem="13" firstAttribute="top" secondItem="2" secondAttribute="top" constant="209" id="23"/>
-                <constraint firstItem="24" firstAttribute="top" secondItem="2" secondAttribute="top" constant="166" id="25"/>
-                <constraint firstItem="24" firstAttribute="trailing" secondItem="13" secondAttribute="trailing" id="27"/>
-                <constraint firstItem="24" firstAttribute="leading" secondItem="13" secondAttribute="leading" id="29"/>
-                <constraint firstItem="24" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="270" id="30"/>
             </constraints>
             <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
         </view>

data/config.yml

@@ -1,8 +1,9 @@
 browser: iOS
 platform: Mac
-version: 7.0
+version: 7.0.3
 app: ./build/Debug-iphoneos/RufusApp.app
 udid: 4550a561efc2c047637f342bd6320623ba98c385
 use_physical: false
-sim_app_path: <%=ENV['HOME']%>/Library/Application Support/iPhone Simulator/7.0/Applications/4550a561efc2c047637f342bd6320623ba98c385/RufusApp.app
-device: iPhoneSimulator
+sim_app_path: <%=ENV['HOME']%>/Library/Application Support/iPhone Simulator/7.0.3/Applications/4550a561efc2c047637f342bd6320623ba98c385/RufusApp.app
+device: iPhoneSimulator
+optimized: true

data/features/step_definitions/driver_steps.rb

@@ -5,7 +5,7 @@ Given(/^I have created a valid appium driver for iOS$/) do
   config = $driver.config
   config["browser"].should eq "iOS"
   config["platform"].should eq "Mac"
-  config["version"].should eq 7.0
+  config["version"].should eq "7.0.3"
   config["app"].should eq app_path
 end
 Given(/^the app is in the "([^"]*)" orientation/) do |orient|

data/features/step_definitions/view_steps.rb

@@ -38,4 +38,10 @@ Then(/^in a block can see the existence of views "([^"]*)", "([^"]*)" and "([^"]
     screen.send("view_#{view_2}_view").exists?.should be_true
     screen.send("view_#{view_3}_view").exists?.should be_true
   end
+end
+Then(/^I can see the view defined "([^"]*)" has text "([^"]*)"$/) do |which, text|
+  on(HomePage).send("view_#{which}_view").text.should == text
+end
+Then(/^I can determine the view defined "([^"]*)" is of type "([^"]*)"$/) do |which, type|
+  on(HomePage).send("view_#{which}_view").class.should.eql?(type)
 end

data/features/support/screens/home_page.rb

@@ -15,6 +15,7 @@ class HomePage
   button(:view_tables, :name => 'tablePageButton')
   button(:alert_Ok, :name => 'Ok')
   button(:alert_Cancel, :name => 'Cancel')
+  label(:view_label, :name => 'Rufus Label')
 
 
   def active?

data/features/view.feature

@@ -36,3 +36,11 @@ Feature: Interacting with views
      Given I am on the "HomePage"
      Then in a block can see the existence of views "rufus", "exists" and "displayed"
 
+   Scenario: Getting text of a view
+     Given I am on the "HomePage"
+     Then I can see the view defined "label" has text "Rufus Label"
+
+   Scenario: Getting the class of a view
+     Given I have created a valid appium driver for iOS
+     And I am on the "HomePage"
+     Then I can determine the view defined "label" is of type "UIAStaticText"

data/lib/rufus.rb

@@ -55,23 +55,23 @@ module Rufus
   end
 
   def find(locator)
-    selenium.find(locator)
+    selenium.send(:driver).find(locator)
   end
 
   def click(locator)
-    selenium.find(locator).click
+    find(locator).click
   end
 
   def page_source
-    selenium.page_source
+    selenium.send(:driver).page_source
   end
 
   def elements_of_type(type)
-    selenium.elements_by_tag(type)
+    selenium.send(:driver).elements_by_tag(type)
   end
 
   def scroll_to(locator)
-    selenium.scroll_to(locator)
+    selenium.send(:driver).scroll_to(locator)
   end
 end
 

data/lib/rufus/accessors/view.rb

@@ -8,32 +8,31 @@ module Rufus
       end
 
       def exists?
-        element = selenium.find(what)
-        !element.nil?
+          selenium.exists?(what)
       end
 
       def click
-        selenium.find(what).click
+        selenium.click(what)
       end
 
       def displayed?
-        selenium.find(what).displayed?
+        selenium.displayed?(what)
       end
 
       def enabled?
-        selenium.find(what).enabled?
+        selenium.enabled?(what)
       end
 
       def text
-        selenium.find(what).text
+        selenium.text(what)
       end
 
       def send_keys(keys)
-        selenium.find(what).send_keys keys
+        selenium.type(keys, what[:name])
       end
 
       def class
-        selenium.find(what).tag_name
+        selenium.class(what)
       end
 
       def what

data/lib/rufus/driver.rb

@@ -1,66 +1,62 @@
 require 'yaml'
-require 'rufus/drivers/iOS_device'
-require 'rufus/drivers/iOS_simulator'
-require 'selenium-webdriver'
 require 'erb'
-require 'selenium/webdriver/safari/extension'
+require 'rufus/drivers/driver_factory'
 
 module Rufus
   class Driver
 
+    attr_reader :config
+    attr_reader :url
+
     def initialize
       raise 'No config.yml found' if !File.exists?('config.yml')
       @config = YAML.load(ERB.new(File.read('config.yml')).result)
-      @url = url(@config)
+      driver
     end
 
     def start
-      driver.get @url
+      driver.start
     end
 
     def quit
       driver.quit
-      @selenium = nil
-    end
-
-    def config
-      @config
-    end
-
-    def server_url
-      @url
+      @selenium_driver = nil
     end
 
     def find(locator)
-      how = locator.keys[0].to_sym
-      what = locator[how]
-      begin
-        driver.find_element(how, what)
-      rescue Selenium::WebDriver::Error::NoSuchElementError
-        return nil
-      end
+     driver.find(locator)
     end
 
     def cells(locator)
-      element = find(locator)
-      raise 'Expected view to be of type UIATableView' unless element.tag_name.eql? 'UIATableView'
-      element.find_elements(:tag_name, 'UIATableCell')
+     driver.cells(locator)
+    end
+
+    def exists?(locator)
+      driver.exists?(locator)
     end
 
     def click(locator)
-      find(locator).click
+     driver.click(locator)
     end
 
     def press_button name
-      click(:name => name)
+     driver.press_button name
     end
 
     def enabled?(locator)
-      find(locator).enabled?
+      driver.enabled?(locator)
     end
 
     def displayed?(locator)
-      find(locator).displayed?
+      driver.displayed?(locator)
+    end
+
+    def text(locator)
+      driver.text(locator)
+    end
+
+    def class(locator)
+      driver.class(locator)
     end
 
     def orientation
@@ -72,87 +68,47 @@ module Rufus
     end
 
     def type(keys, name)
-      element = find(:name => name)
-      element.click
-      sleep 1
-      element.send_keys keys
+      driver.type(keys, name)
     end
 
     def sequence(*names, times)
-      timed_sequence(names, times, 1)
+      driver.sequence(names, times, 1)
     end
 
     def buttons
-      buttons = []
-      elements = elements_by_tag 'UIAButton'
-      elements.each do |element|
-        buttons << element.text
-      end
-      buttons
+      driver.buttons
     end
 
     def text_fields
-      fields = []
-      elements = elements_by_tag 'UIATextField'
-      elements.each do |element|
-        fields << element.text
-      end
-      fields
+      driver.text_fields
     end
 
     def labels
-      labels = []
-      elements = elements_by_tag 'UIAStaticText'
-      elements.each do |element|
-        labels << element.text
-      end
-      labels
+      driver.labels
     end
 
     def timed_sequence(names, times, seconds)
-      current = 0
-      until current == times
-        names.each do |name|
-          click(:name => name)
-          sleep seconds
-
-        end
-        current += 1
-        puts "sequence #{current} completed"
-      end
+      driver.timed_sequence(names, times, seconds)
     end
 
     def find_alert(locator)
-      alert = nil
-      all_elements.each do |element|
-        if is_alert?(element)
-          alert = element if match?(element, locator[:name])
-        end
-      end
-      alert
+      driver.find_alert(locator)
     end
 
     def click_alert(button)
-      if alert_shown?
-        click_alert_button(button)
-      end
+      driver.click_alert(button)
     end
 
     def alert_shown?
-      all_elements.each do |element|
-        if is_alert?(element)
-          return true
-        end
-      end
-      false
+      driver.alert_shown?
     end
 
     def class_for(element)
-      element.tag_name
+      driver.class_for(element)
     end
 
     def match?(element, name)
-      element.attribute(:name).eql? name
+      driver.match?
     end
 
     def page_source
@@ -160,56 +116,23 @@ module Rufus
     end
 
     def all_elements
-      elements_by_tag('UIAElement')
+      driver.all_elements
     end
 
     def elements_by_tag(name)
-      driver.find_elements(:tag_name, name)
+      driver.elements_by_tag name
     end
 
     def scroll_to(locator)
-      id = find(locator).ref
-      driver.execute_script 'mobile: scrollTo', {'element' => id}
+      driver.scroll_to(locator)
     end
 
     def screenshot(name)
-      driver.save_screenshot name
-    end
-
-    private
-
-    def url(config)
-      if config["appium_url"].nil? || config["appium_url"].eql?("")
-        'http://127.0.0.1:4723/wd/hub'
-      else
-        config["appium_url"]
-      end
-    end
-
-    def click_alert_button(button)
-      all_elements.each do |element|
-        element.click if is_table_view_cell?(element) && match?(element, button)
-      end
-    end
-
-    def is_alert?(element)
-      class_for(element).eql?('UIAAlert')
-    end
-
-    def is_table_view_cell?(element)
-      class_for(element).eql?('UIATableCell')
+      driver.screenshot name
     end
 
     def driver
-      if use_device
-        @selenium ||= Rufus::Drivers::IOS_Device.for(@config,@url)
-      else
-        @selenium ||= Rufus::Drivers::IOS_Simulator.for(@config,@url)
-      end
-    end
-
-    def use_device
-      @config["use_physical"] == true
+      @selenium_driver ||= Rufus::Drivers::DriverFactory.driver_for(@config)
     end
   end
 end