AXElements 0.8.0 → 0.8.1

data/README.markdown

@@ -64,8 +64,10 @@ You need to have the OS X command line tools installed in order to
 build and install AXElements, but you will also need Xcode in order to
 run the test suite (sorry). Go ahead and install the tools now if you
 haven't done that yet, I'll wait. Once you have the developer tools,
-you should install MacRuby, the latest nightly build is required. If you
-are on Snow Leopard, you will also need to install the
+you should install [MacRuby](http://macruby.org/), version 0.12 or
+later is required and downloads can be found at
+https://github.com/MacRuby/MacRuby/downloads.
+If you are on Snow Leopard, you will also need to install the
 [Bridge Support Preview](http://www.macruby.org/blog/2010/10/08/bridgesupport-preview.html).
 
 Then you can install AXElements. You can install AXElements via
@@ -123,12 +125,9 @@ as the technical underpinnings of AXElements.
 
 ## Development
 
-Development of a stable release of AXElements is under way! The main
-focus is an overall refactoring to create a more robust core, end user
-features will become more consistent, and performance will
-increase. Documentation will be overhauled and more examples will be
-added. It will be magical, so we're code naming the next version
-"Clefairy".
+AXElements has reached a point where the main focus is now performance,
+features, and documentation. It will be magical, so we're code naming
+the next version "Clefable".
 
 ![The Moon](https://github.com/Marketcircle/AXElements/raw/gh-pages/images/next_version.png)
 

data/lib/accessibility/dsl.rb

@@ -4,17 +4,21 @@ require 'mouse'
 require 'ax/element'
 require 'ax/application'
 require 'ax/systemwide'
+require 'ax/scroll_area'
+require 'ax/menu'
 require 'accessibility'
 require 'accessibility/enumerators'
 
 ##
 # DSL methods for AXElements.
 #
-# The idea here is to pull actions out from an object and put them
-# in front of object to give AXElements more of a DSL feel to make
-# communicating test steps more clear. See the
-# [Acting tutorial](http://github.com/Marketcircle/AXElements/wiki/Acting)
-# for a more in depth tutorial on using this module.
+# The DSL for AXElements is designed to pull actions out from an object
+# and put them in front of object to make communicating test steps seem
+# more like human instructions.
+#
+# You can read more about the DSL in the
+# [Acting](http://github.com/Marketcircle/AXElements/wiki/Acting)
+# section of the AXElements wiki.
 module Accessibility::DSL
 
 
@@ -156,52 +160,6 @@ module Accessibility::DSL
     app.perform :terminate
   end
 
-  ##
-  # Find the application with the given bundle identifier. If the
-  # application is not already running, it will be launched.
-  #
-  # @example
-  #
-  #   app_with_bundle_identifier 'com.apple.finder'
-  #   launch                     'com.apple.mail'
-  #
-  # @param [String]
-  # @return [AX::Application,nil]
-  def app_with_bundle_identifier id
-    Accessibility.application_with_bundle_identifier id
-  end
-  alias_method :app_with_bundle_id, :app_with_bundle_identifier
-  alias_method :launch,             :app_with_bundle_identifier
-
-  ##
-  # Find the application with the given name. If the application
-  # is not already running, it will NOT be launched and this
-  # method will return `nil`.
-  #
-  # @example
-  #
-  #   app_with_name 'Finder'
-  #
-  # @param [String]
-  # @return [AX::Application,nil]
-  def app_with_name name
-    AX::Application.new name
-  end
-
-  ##
-  # Find the application with the given process identifier. An
-  # invalid PID will cause an exception to be raised.
-  #
-  # @example
-  #
-  #   app_with_pid 35843
-  #
-  # @param [Fixnum]
-  # @return [AX::Application]
-  def app_with_pid pid
-    AX::Application.new pid
-  end
-
   ##
   # Focus an element on the screen, but only if it can be directly
   # focused. It is safe to pass any element into this method as nothing
@@ -292,6 +250,64 @@ module Accessibility::DSL
     app.select_menu_item *path
   end
 
+  ##
+  # Show the "About" window for an app. Returns the window that is
+  # opened.
+  #
+  # @param [AX::Application]
+  # @return [AX::Window]
+  def show_about_window_for app
+    app.show_about_window
+  end
+
+  ##
+  # @note This method assumes that the app has setup the standard
+  #       CMD+, hotkey to open the pref window
+  #
+  # Try to open the preferences for an app. Returns the window that
+  # is opened.
+  #
+  # @param [AX::Application]
+  # @return [AX::Window]
+  def show_preferences_window_for app
+    app.show_preferences_window
+  end
+
+  ##
+  # Scroll through a scroll area until the given element is visible.
+  #
+  # If you need to scroll an unknown amount of units through a table
+  # or another type of object contained in as scroll area, you can
+  # just pass the element that you are trying to get to and this method
+  # will scroll to it for you.
+  #
+  # @example
+  #
+  #   scroll_to table.rows.last
+  #
+  # @param [AX::Element]
+  # @return [void]
+  def scroll_to element
+    element.ancestor(:scroll_area).scroll_to element
+  end
+  alias_method :scroll_to_visible, :scroll_to
+
+  ##
+  # Scroll a menu to an item in the menu and then move the mouse
+  # pointer to that item.
+  #
+  # @example
+  #
+  #   click window.pop_up do
+  #     scroll_menu_to pop_up.menu.item(title: "Expensive Cake")
+  #   end
+  #
+  # @param [AX:]
+  # @return [void]
+  def scroll_menu_to element
+    menu = element.ancestor(:menu).scroll_to element
+  end
+
 
   # @group Polling
 
@@ -521,17 +537,18 @@ module Accessibility::DSL
   #
   #   click
   #   click window.close_button
+  #   click do
+  #     move_mouse_to [0,0]
+  #   end
   #
+  # @yield Optionally take a block that is executed between click down
+  #        and click up events.
   # @param [#to_point]
   def click obj = nil, wait = 0.2
     move_mouse_to obj, wait: 0 if obj
-    if block_given?
-      Mouse.click_down
-      yield
-      Mouse.click_up
-    else
-      Mouse.click
-    end
+    Mouse.click_down
+    yield if block_given?
+    Mouse.click_up
     sleep wait
   end
 
@@ -603,13 +620,13 @@ module Accessibility::DSL
   #
   # @example
   #
-  #   puts subtree_for app
+  #   puts subtree app
   #
   # @return [String]
-  def subtree_for element
+  def subtree element
     element.inspect_subtree
   end
-  alias_method :subtree, :subtree_for
+  alias_method :subtree_for, :subtree
 
   ##
   # @note You will need to have GraphViz command line tools installed
@@ -627,16 +644,11 @@ module Accessibility::DSL
   def graph element
     require 'accessibility/graph'
     graph = Accessibility::Graph.new(element)
-    graph.build!
-
-    require 'tempfile'
-    file = Tempfile.new('graph')
-    File.open(file.path, 'w') do |fd| fd.write graph.to_dot end
-    `dot -Tpng #{file.path} > #{file.path}.png`
-    `open #{file.path}.png`
-
-    file.path
+    path  = graph.generate_png!
+    `open #{path}`
+    path
   end
+  alias_method :graph_for, :graph
 
   ##
   # Take a screen shot and save it to disk. If a file name and path are
@@ -659,6 +671,9 @@ module Accessibility::DSL
   # @param [#to_s]
   # @return [String] path to the screenshot
   def screenshot name = "AXElements-ScreenShot", dir = '~/Desktop'
+    # @todo this could move to its own class, much like
+    #       {Accessibility::Highlighter} and expose more options
+    #       while retaining good defaults
     dir  = File.expand_path dir.to_s
     file = "#{dir}/#{name}-#{Time.now.strftime '%Y%m%d%H%M%S'}.png"
 
@@ -675,10 +690,56 @@ module Accessibility::DSL
     file
   end
   alias_method :capture_screen, :screenshot
-  alias_method :shoot_screen,   :screenshot
 
 
-  # @group Macros
+  # @endgroup
+
+
+  ##
+  # Find the application with the given bundle identifier. If the
+  # application is not already running, it will be launched.
+  #
+  # @example
+  #
+  #   app_with_bundle_identifier 'com.apple.finder'
+  #   launch                     'com.apple.mail'
+  #
+  # @param [String]
+  # @return [AX::Application,nil]
+  def app_with_bundle_identifier id
+    Accessibility.application_with_bundle_identifier id
+  end
+  alias_method :app_with_bundle_id, :app_with_bundle_identifier
+  alias_method :launch,             :app_with_bundle_identifier
+
+  ##
+  # Find the application with the given name. If the application
+  # is not already running, it will NOT be launched and this
+  # method will return `nil`.
+  #
+  # @example
+  #
+  #   app_with_name 'Finder'
+  #
+  # @param [String]
+  # @return [AX::Application,nil]
+  def app_with_name name
+    AX::Application.new name
+  end
+
+  ##
+  # Find the application with the given process identifier. An
+  # invalid PID will cause an exception to be raised.
+  #
+  # @example
+  #
+  #   app_with_pid 35843
+  #
+  # @param [Fixnum]
+  # @return [AX::Application]
+  def app_with_pid pid
+    AX::Application.new pid
+  end
 
   ##
   # Convenience for `AX::SystemWide.new`.
@@ -722,94 +783,6 @@ module Accessibility::DSL
     base = opts[:for] || system_wide
     base.element_at point
   end
-
-  ##
-  # Show the "About" window for an app. Returns the window that is
-  # opened.
-  #
-  # @param [AX::Application]
-  # @return [AX::Window]
-  def show_about_window_for app
-    app.show_about_window
-  end
-
-  ##
-  # @note This method assumes that the app has setup the standard
-  #       CMD+, hotkey to open the pref window
-  #
-  # Try to open the preferences for an app. Returns the window that
-  # is opened.
-  #
-  # @param [AX::Application]
-  # @return [AX::Window]
-  def show_preferences_window_for app
-    app.show_preferences_window
-  end
-
-  ##
-  # Scroll though a scroll area until the given element is visible.
-  #
-  # If you need to scroll an unknown ammount of units through a scroll area
-  # you can just pass the element that you need visible and this method
-  # will scroll to it for you.
-  #
-  # @example
-  #
-  #   scroll_to table.rows.last
-  #
-  # @param [AX::Element]
-  # @return [void]
-  def scroll_to element
-    scroll_area = element.ancestor :scroll_area
-
-    return if NSContainsRect(scroll_area.bounds, element.bounds)
-    move_mouse_to scroll_area
-    # calculate direction to scroll
-    direction = element.position.y > scroll_area.position.y ? -5 : 5
-    until NSContainsRect(scroll_area.bounds, element.bounds)
-      Mouse.scroll direction
-    end
-    sleep 0.1
-  end
-  alias_method :scroll_to_visible, :scroll_to
-
-  ##
-  # Scroll a menu to an item in the menu and then move the mouse
-  # pointer to that item.
-  #
-  # @example
-  #
-  #   scroll_menu_to menu.element(title: "Expensive Cake")
-  #
-  # @param [AX:]
-  # @return [void]
-  def scroll_menu_to element
-    menu = element.ancestor :menu
-    move_mouse_to menu
-
-    row_height = menu.menu_item.size.height
-    point = menu.position
-    point.x += menu.size.width / 2
-    point.y += if element.position.y > menu.position.y
-                 menu.size.height - (row_height * 0.1)
-               else
-                 row_height * 0.1
-               end
-
-    until NSContainsRect(menu.bounds, element.bounds)
-      move_mouse_to point
-    end
-
-    start = Time.now
-    until Time.now - start > 5
-      # This can happen sometimes with the little arrow bars
-      # in menus covering up the menu item.
-      if element_under_mouse != element
-        move_mouse_to element
-      else
-        break
-      end
-    end
-  end
+  alias_method :element_at, :element_at_point
 
 end

data/lib/accessibility/errors.rb

@@ -1,3 +1,5 @@
+require 'accessibility/qualifier'
+
 ##
 # Error raised when an implicit search fails to return a result.
 class Accessibility::SearchFailure < NoMethodError
@@ -5,13 +7,13 @@ class Accessibility::SearchFailure < NoMethodError
   # @param [AX::Element]
   # @param [#to_s]
   # @param [Hash{Symbol=>Object}]
-  def initialize searcher, searchee, filters
+  def initialize searcher, searchee, filters, &block
     filters = {} unless filters.kind_of? Hash
-    msg  = "Could not find `#{pp_searchee searchee, filters}` "
+    msg  = "Could not find `#{pp_searchee searchee, filters, &block}` "
     msg << "as a child of #{searcher.class}\n"
     msg << "Element Path:\n\t" << path_to(searcher)
     # @todo Consider turning this on by default
-    msg << "\nSubtree:\n\n" << subtree_for(searcher) if Accessibility.debug?
+    msg << "\nSubtree:\n\n" << searcher.inspect_subtree if Accessibility.debug?
     super msg
   end
 
@@ -19,8 +21,8 @@ class Accessibility::SearchFailure < NoMethodError
   private
 
   # Nice string representation of what was being searched for
-  def pp_searchee searchee, filters
-    Accessibility::Qualifier.new(searchee, filters).describe
+  def pp_searchee searchee, filters, &block
+    Accessibility::Qualifier.new(searchee, filters, &block).describe
   end
 
   # Nice string representation of element's path from the application root

data/lib/accessibility/graph.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 ##
 # DOT graph generator for AXElements. It can generate the digraph code
 # for a UI subtree. That code can then be given to GraphViz to generate
@@ -178,6 +180,7 @@ class Accessibility::Graph
       # should use #size_of(:children), but that doesn't in all cases
       @edge_queue.concat Array.new(element.children.size, node)
     end
+    @built = true
   end
 
   ##
@@ -193,4 +196,17 @@ class Accessibility::Graph
     graph << "\n}\n"
   end
 
+  ##
+  # Generate the PNG file for the graph and save it to a temporary
+  # file. The path to the temporary file will be returned.
+  #
+  # @return [String] path to the saved PNG file
+  def generate_png!
+    build! unless @built
+    file = Tempfile.new 'ax_elements_graph'
+    file.write self.to_dot
+    `dot -Tpng #{file.path} > #{file.path}.png`
+    "#{file.path}.png"
+  end
+
 end

data/lib/accessibility/version.rb

@@ -2,8 +2,8 @@
 # The main AXElements namespace.
 module Accessibility
   # @return [String]
-  VERSION   = '0.8.0'
+  VERSION   = '0.8.1'
 
   # @return [String]
-  CODE_NAME = 'Clefairy'
+  CODE_NAME = 'Clefable'
 end

data/lib/accessibility.rb

@@ -51,7 +51,7 @@ class << Accessibility
         sleep 1
       end
     else
-      raise ArgumentError "Could not launch app matching bundle id `#{bundle}'"
+      raise ArgumentError, "Could not launch app matching bundle id `#{bundle}'"
     end
     nil
   end

data/lib/ax/application.rb

@@ -197,21 +197,17 @@ class AX::Application < AX::Element
   #
   # @return [AX::MenuItem]
   def navigate_menu *path
-    # @todo CLEAN UP
     perform :unhide # can't navigate menus unless the app is up front
-    current = attribute(:menu_bar).search(:menu_bar_item, title: path.shift)
+    bar_item = item = self.menu_bar.menu_bar_item(title: path.shift)
     path.each do |part|
-      current.perform :press
-      next_item = current.search(:menu_item, title: part)
-      if next_item.blank?
-        failure = Accessibility::SearchFailure.new(current, :menu_item, title: part)
-        current.perform :cancel # close menu
-        raise failure
-      else
-        current = next_item
-      end
+      item.perform :press
+      next_item = item.menu_item(title: part)
+      item = next_item
     end
-    current
+    item
+  ensure
+    # got to the end
+    bar_item.perform :cancel unless item.title == path.last
   end
 
   ##

data/lib/ax/element.rb

@@ -340,7 +340,7 @@ class AX::Element
 
     elsif @ref.attributes.include? KAXChildrenAttribute
       if (result = search(method, *args, &block)).blank?
-        raise Accessibility::SearchFailure.new(self, method, args.first)
+        raise Accessibility::SearchFailure.new(self, method, args.first, &block)
       else
         return result
       end

data/lib/ax/menu.rb

@@ -0,0 +1,67 @@
+require 'ax/element'
+require 'mouse'
+
+##
+# UI element representing a menu. Not much to it...
+class AX::Menu < AX::Element
+
+  ##
+  # Scroll the menu until the given element, which must be in the menu
+  # is visible in the bounds of the menu. This method will also move the
+  # mouse pointer to the given element.
+  #
+  # If you need to scroll an unknown number of units through a menu,
+  # you can just pass the element that you need visible and this method
+  # will scroll to it for you.
+  #
+  # @example
+  #
+  #   click window.pop_up do
+  #     menu = pop_up.menu
+  #     menu.scroll_to menu.item(title: "Expensive Cake")
+  #   end
+  #
+  # @param [AX::Element]
+  # @return [void]
+  def scroll_to element
+    Mouse.move_to self.to_point
+
+    # calculate which scroll arrow to move to
+    fudge_factor = self.item.size.height * 0.1
+    point = self.position
+    size  = self.size
+    point.x += size.width / 2
+    point.y += if element.position.y > point.y
+                 size.height - fudge_factor
+               else
+                 fudge_factor
+               end
+
+    # scroll until element is visible
+    until NSContainsRect(self.bounds, element.bounds)
+      Mouse.move_to point
+    end
+
+    start = Time.now
+    until Time.now - start > 5
+      # Sometimes the little arrow bars in menus covering
+      # up the menu item and we have to move just a bit more.
+      if self.application.element_at(Mouse.current_position) != element
+        Mouse.move_to element.to_point
+      else
+        break
+      end
+    end
+  end
+
+  ##
+  # Search the menu for a `menu_item` that matches the given
+  # filters. The filters should be specified just as they would
+  # be when calling {#search}.
+  def item filters = {}, &block
+    result = self.search :menu_item, filters, &block
+    return result unless result.blank?
+    raise Accessibility::SearchFailure.new(self, :menu_item, filters, &block)
+  end
+
+end

data/lib/ax/row.rb

@@ -31,7 +31,7 @@ class AX::Row < AX::Element
     qualifier = Accessibility::Qualifier.new(:Column, filters, &block)
     column    = self.parent.columns.index { |x| qualifier.qualifies? x }
     return self.children.at(column) if column
-    raise Accessibility::SearchFailure.new(self.parent, 'column', filters)
+    raise Accessibility::SearchFailure.new(self.parent, 'column', filters, &block)
   end
 
 end

data/lib/ax/scroll_area.rb

@@ -0,0 +1,33 @@
+require 'ax/element'
+
+##
+# UI element for a view that can scroll? I'm not sure how else to
+# describe it, the class name says it all.
+class AX::ScrollArea < AX::Element
+
+  ##
+  # Scroll through the receiver until the given element is visible.
+  #
+  # If you need to scroll an unknown amount of units through a scroll
+  # area, or something in a scroll area (i.e. a table), you can just
+  # pass the element that you are trying to get to and this method
+  # will scroll to it for you.
+  #
+  # @example
+  #
+  #   scroll_area.scroll_to table.rows.last
+  #
+  # @param [AX::Element]
+  # @return [void]
+  def scroll_to element
+    return if NSContainsRect(self.bounds, element.bounds)
+    Mouse.move_to self.to_point
+    # calculate direction to scroll
+    direction = element.position.y > self.position.y ? -5 : 5
+    until NSContainsRect(self.bounds, element.bounds)
+      Mouse.scroll direction
+    end
+    sleep 0.1
+  end
+
+end

data/lib/mouse.rb

@@ -92,30 +92,15 @@ module Mouse
     end
   end
 
-  ##
-  # A standard click. Default position is the current position.
-  #
-  # This `duration` parameter is used to add a minimum time between
-  # down and up click as clicking up too fast has shown to screw things up in
-  # some cases. However, the duration is arbitrary and if the system lags it
-  # could cause certain timing behaviours (consider the two behaviours of
-  # pop up buttons).
-  #
-  # @param [CGPoint]
-  def click point = current_position, duration = 12
-    click_down
-    sleep QUANTUM*duration
-    click_up
-  end
-
   ##
   # Perform a down click. You should follow this up with a call to
   # {#click_up} to finish the click.
   #
   # @param [CGPoint]
-  def click_down point = current_position
+  def click_down point = current_position, duration = 12
     event = new_event KCGEventLeftMouseDown, point, KCGMouseButtonLeft
     post event
+    sleep QUANTUM*duration
   end
 
   ##

data/rakelib/ext.rake

@@ -46,8 +46,8 @@ task :clobber_key_coder do
     $stdout.puts "rm #{file}"
     rm_f file
   end
-  file = 'rm ext/accessibility/key_coder/Makefile'
-  $stdout.puts file
+  file = 'ext/accessibility/key_coder/Makefile'
+  $stdout.puts "rm #{file}"
   rm_f file
 end
 

data/test/integration/accessibility/test_dsl.rb

@@ -12,7 +12,6 @@ class TestAccessibilityDSL < MiniTest::Unit::TestCase
     @dsl ||= DSL.new
   end
 
-  def app;             @@app       ||= AX::Application.new REF                               end
   def text_area;       @@text_area ||= app.main_window.text_area                             end
   def pop_up;          @@pop_up    ||= app.main_window.pop_up                                end
   def pref_window;     app.children.find { |x| x.attribute(:title) == 'Preferences'   }      end

data/test/integration/accessibility/test_enumerators.rb

@@ -2,10 +2,6 @@ require 'test/integration/helper'
 
 class TestAccessibilityEnumeratorsBreadthFirst < MiniTest::Unit::TestCase
 
-  def app
-    @@app ||= AX::Application.new REF
-  end
-
   def test_each_iterates_in_correct_order
     tab_group = app.main_window.children.find { |x| x.class == AX::TabGroup }
     enum      = Accessibility::Enumerators::BreadthFirst.new(tab_group)

data/test/integration/accessibility/test_errors.rb

@@ -1,38 +1,41 @@
+# -*- coding: utf-8 -*-
 require 'test/integration/helper'
 
 class TestAccessibilityErrors < MiniTest::Unit::TestCase
 
   def test_search_failure_shows_arguments
-    e = Accessibility::SearchFailure.new(AX::DOCK, :list, {herp: :derp})
+    e = Accessibility::SearchFailure.new(app, :list, {herp: :derp}) { }
+    def e.backtrace; []; end
+    assert_match /Could not find `List\(herp: :derp\)\[✔\]`/, e.message
+
+    e = Accessibility::SearchFailure.new(app, :list, {herp: :derp})
     def e.backtrace; []; end
     assert_match /Could not find `List\(herp: :derp\)`/, e.message
     assert_match /as a child of AX::Application/, e.message
     assert_match /Element Path:\n\t\#<AX::Application/, e.message
 
-    e = Accessibility::SearchFailure.new(AX::DOCK, :list, {})
+    e = Accessibility::SearchFailure.new(app, :list, {})
     def e.backtrace; []; end
     assert_match /Could not find `List`/, e.message
 
-    e = Accessibility::SearchFailure.new(AX::DOCK, :list, nil)
+    e = Accessibility::SearchFailure.new(app, :list, nil)
     def e.backtrace; []; end
     assert_match /Could not find `List`/, e.message
   end
 
   def test_search_failure_shows_element_path
-    l = AX::DOCK.children.first
-    e = Accessibility::SearchFailure.new(l, :trash_dock_item, nil)
+    e = Accessibility::SearchFailure.new(app.menu_bar, :trash_dock_item, nil)
     def e.backtrace; []; end
     assert_match /AX::Application/, e.message
-    assert_match /AX::List/, e.message
+    assert_match /AX::MenuBar/, e.message
   end
 
   def test_search_failure_includes_subtree_in_debug_mode
     assert Accessibility.debug?, 'Someone turned debugging off'
-    l = AX::DOCK.children.first
-    e = Accessibility::SearchFailure.new(l, :trash_dock_item, nil)
+    e = Accessibility::SearchFailure.new(app.menu_bar, :trash_dock_item, nil)
     def e.backtrace; []; end
     assert_match /Subtree:/, e.message
-    assert_match subtree_for(l), e.message
+    assert_match app.menu_bar.inspect_subtree, e.message
   end
 
 end

data/test/integration/accessibility/test_graph.rb

@@ -0,0 +1,12 @@
+require 'test/integration/helper'
+require 'accessibility/graph'
+
+class TestAccessibilityGraph < MiniTest::Unit::TestCase
+
+  def test_generate
+    p = Accessibility::Graph.new(app.main_window).generate_png!
+    assert File.exists? p
+    assert_match /^PNG image/, `file --brief #{p}`
+  end
+
+end

data/test/integration/accessibility/test_qualifier.rb

@@ -3,10 +3,6 @@ require 'test/integration/helper'
 
 class TestAccessibilityQualifier < MiniTest::Unit::TestCase
 
-  def app
-    AX::Application.new REF
-  end
-
   def qualifier klass, criteria, &block
     Accessibility::Qualifier.new(klass, criteria, &block)
   end

data/test/integration/ax/test_application.rb

@@ -2,12 +2,8 @@ require 'test/integration/helper'
 
 class TestAXApplication < MiniTest::Unit::TestCase
 
-  def app
-    @app ||= AX::Application.new REF
-  end
-
   def running_app
-    @app.instance_variable_get :@app
+    app.instance_variable_get :@app
   end
 
   def test_initialize_args

data/test/integration/ax/test_element.rb

@@ -2,10 +2,6 @@ require 'test/integration/helper'
 
 class TestAXElement < MiniTest::Unit::TestCase
 
-  def app
-    @@app ||= AX::Application.new PID
-  end
-
   def test_path_returns_correct_elements_in_correct_order
     list = app.window.close_button.ancestry
     assert_equal 3, list.size

data/test/integration/ax/test_menu.rb

@@ -0,0 +1,29 @@
+require 'test/integration/helper'
+
+class TestAXMenu < MiniTest::Unit::TestCase
+
+  def test_item
+    pop_up = app.main_window.pop_up
+    click pop_up
+
+    assert_respond_to pop_up.menu, :item
+
+    assert_equal 'Togusa', pop_up.menu.item(title: 'Togusa').title
+
+    pop_up.menu.item(title: '38') { |x| @got_called = true }
+    assert @got_called
+
+  ensure
+    click pop_up if pop_up
+  end
+
+
+  def test_item_raises
+    pop_up = app.main_window.pop_up
+    click pop_up
+    assert_raises(Accessibility::SearchFailure) { pop_up.menu.item(herp: 'derp') }
+  ensure
+    click pop_up if pop_up
+  end
+
+end

data/test/integration/ax/test_row.rb

@@ -2,7 +2,6 @@ require 'test/integration/helper'
 
 class TestAXRow < MiniTest::Unit::TestCase
 
-  def app;   @@app   ||= AX::Application.new REF end
   def table; @@table ||= app.main_window.table end
   def rows;  @@rows  ||= table.rows end
   def row;               rows.first end

data/test/integration/ax_elements/test_nsarray_compat.rb

@@ -2,10 +2,6 @@ require 'test/integration/helper'
 
 class TestNSArrayCompat < MiniTest::Unit::TestCase
 
-  def app
-    @@app ||= AX::Application.new PID
-  end
-
   def test_raises_for_non_elements
     assert_raises NoMethodError do
       [1].rows

data/test/integration/minitest/test_ax_elements.rb

@@ -3,10 +3,6 @@ require 'minitest/ax_elements'
 
 class TestMiniTestAssertions < MiniTest::Unit::TestCase
 
-  def app
-    @@app ||= AX::Application.new PID
-  end
-
   def test_assert_has_child
     expected = app.window
 

data/test/integration/rspec/expectations/test_ax_elements.rb

@@ -4,11 +4,6 @@ require 'rspec/expectations/ax_elements'
 
 class TestRSpecMatchers < MiniTest::Unit::TestCase
 
-  def app
-    @@app ||= AX::Application.new PID
-  end
-
-
 
   def test_have_child_should_failure_message
     e = app.main_window.slider

metadata

@@ -2,14 +2,14 @@
 name: AXElements
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Mark Rada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00 Z
+date: 2012-04-25 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -88,9 +88,11 @@ files:
 - lib/ax/application.rb
 - lib/ax/button.rb
 - lib/ax/element.rb
+- lib/ax/menu.rb
 - lib/ax/pop_up_button.rb
 - lib/ax/radio_button.rb
 - lib/ax/row.rb
+- lib/ax/scroll_area.rb
 - lib/ax/static_text.rb
 - lib/ax/systemwide.rb
 - lib/ax_elements/awesome_print.rb
@@ -117,9 +119,11 @@ files:
 - test/integration/accessibility/test_dsl.rb
 - test/integration/accessibility/test_enumerators.rb
 - test/integration/accessibility/test_errors.rb
+- test/integration/accessibility/test_graph.rb
 - test/integration/accessibility/test_qualifier.rb
 - test/integration/ax/test_application.rb
 - test/integration/ax/test_element.rb
+- test/integration/ax/test_menu.rb
 - test/integration/ax/test_row.rb
 - test/integration/ax_elements/test_nsarray_compat.rb
 - test/integration/minitest/test_ax_elements.rb
@@ -174,9 +178,11 @@ test_files:
 - test/integration/accessibility/test_dsl.rb
 - test/integration/accessibility/test_enumerators.rb
 - test/integration/accessibility/test_errors.rb
+- test/integration/accessibility/test_graph.rb
 - test/integration/accessibility/test_qualifier.rb
 - test/integration/ax/test_application.rb
 - test/integration/ax/test_element.rb
+- test/integration/ax/test_menu.rb
 - test/integration/ax/test_row.rb
 - test/integration/ax_elements/test_nsarray_compat.rb
 - test/integration/minitest/test_ax_elements.rb