mohawk 0.4.2 → 0.4.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c7ab94d6b93e2f14327fa9747ea153e5216b1853
+  data.tar.gz: dc8fc1469e763cd93b400518145f1142b5c06443
+SHA512:
+  metadata.gz: 43ec9b93a18ef6a7dc047eae81dfb1b90b3cd44a67887dd8972060d9744a373e902914c12fa5995975ba43b2ddb7494fadecf117cfaf79e870b48a1602e040fb
+  data.tar.gz: d3ce5ebdcfc9841dacb8dd6e3d28021f31f9428994ceec8a7955ecb3e355ca4412e66f01b4c1ac3e26396d849afa1373025c2ecdb1faa13a6f5e32a823b69bb2

data/features/support/env.rb

@@ -1,6 +1,5 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../../', 'lib'))
 
-require 'rspec-expectations'
 require 'childprocess'
 require 'mohawk'
 

data/features/support/screens/data_entry_form.rb

@@ -5,7 +5,7 @@ class DataEntryForm
   table(:people, :id => "personListView")
   button(:add_more, :value => 'Add Many')
 
-  def wait_until_present
+  def wait_until_present(context=nil)
     super
     wait_for_control :id => "personListView"
   end

data/lib/mohawk/accessors.rb

@@ -17,7 +17,7 @@ module Mohawk
     end
 
     def required_controls(*controls)
-      define_method(:wait_until_present) do
+      define_method(:wait_until_present) do |context=nil|
         controls.each do |control|
           super()
           begin

data/lib/mohawk/adapters/uia/window.rb

@@ -51,8 +51,8 @@ module Mohawk
           locate_element != nil
         end
 
-        def wait_until_present
-          wait_until { element }
+        def wait_until_present(context=nil)
+          wait_until(Mohawk.timeout, context) { element }
         end
 
         private
@@ -66,4 +66,4 @@ module Mohawk
       end
     end
   end
-end
+end

data/lib/mohawk/adapters/uia_adapter.rb

@@ -6,6 +6,8 @@ module Mohawk
     class UiaAdapter
       include UIA
 
+      attr_reader :locator
+
       def initialize(locator, container=nil)
         @children_only = locator.delete :children_only
         @locator = locator
@@ -74,4 +76,4 @@ module Mohawk
       end
     end
   end
-end
+end

data/lib/mohawk/navigation.rb

@@ -6,7 +6,7 @@ module Mohawk
 
     def on(cls, extra={}, &block)
       screen = cls.new extra
-      screen.wait_until_present
+      screen.wait_until_present "Unable to locate #{cls} using #{screen.adapter.locator}"
       block.call screen if block
       screen
     end

data/lib/mohawk/version.rb

@@ -1,3 +1,3 @@
 module Mohawk
-  VERSION = "0.4.2"
+  VERSION = '0.4.3'
 end

data/lib/mohawk/waiter.rb

@@ -5,14 +5,14 @@ module Mohawk
     class WaitTimeout < StandardError;
     end
 
-    def wait_until(timeout=Mohawk.timeout, &block)
+    def wait_until(timeout=Mohawk.timeout, context=nil, &block)
       start = Time.now
       until (result = block.call) || (Time.now - start > timeout)
         sleep 0.25
       end
 
-      raise WaitTimeout unless result
+      raise WaitTimeout, context unless result
       result
     end
   end
-end
+end

data/lib/mohawk.rb

@@ -91,8 +91,8 @@ module Mohawk
   #
   # Waits until the window is present
   #
-  def wait_until_present
-    adapter.window.wait_until_present
+  def wait_until_present(context=nil)
+    adapter.window.wait_until_present context
   end
 
   #

data/mohawk.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'childprocess', '~> 0.5'
 
   gem.add_development_dependency 'cucumber'
-  gem.add_development_dependency 'rspec', '2.14.1'
+  gem.add_development_dependency 'rspec', '3.5.0'
   gem.add_development_dependency 'rspec-given'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'childprocess'
@@ -32,5 +32,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'guard'
   gem.add_development_dependency 'guard-rspec'
   gem.add_development_dependency 'terminal-notifier-guard'
-  gem.add_development_dependency 'json', '~> 1.7.7'
+  gem.add_development_dependency 'json', '~> 2.1.0'
 end

data/spec/lib/mohawk/adapters/uia/control_spec.rb

@@ -29,7 +29,7 @@ describe Mohawk::Adapters::UiaAdapter::Control do
   end
 
   context '#patterns' do
-    Given { parent.stub(:find) {|l| @locator = l } }
+    Given { allow(parent).to receive(:find) {|l| @locator = l } }
     Given(:no_filter) { new_control(id: 'hi') }
     Given(:some_filter) { HasPattern.new adapter, id: 'hi' }
     Given(:overridden) { HasPattern.new adapter, id: 'hi', pattern: :overridden }

data/spec/lib/mohawk/adapters/uia/table_row_spec.rb

@@ -8,8 +8,8 @@ describe Mohawk::Adapters::UIA::TableRow do
   subject { Mohawk::Adapters::UIA::TableRow.new table, 123 }
 
   def set_expected_cells(h)
-    element.stub(:items).and_return h.values.map {|v| UiaTableCell.new v }
-    table.stub(:headers).and_return h.keys.map(&:to_s)
+    allow(element).to receive(:items).and_return h.values.map {|v| UiaTableCell.new v }
+    allow(table).to receive(:headers).and_return h.keys.map(&:to_s)
   end
 
   context '#all_match?' do

data/spec/lib/mohawk/navigation_spec.rb

@@ -1,5 +1,14 @@
 require 'spec_helper'
 
+def non_existent_locator
+  {:title => /I don't exist/}
+end
+
+class NonExistentScreen
+  include Mohawk
+  window non_existent_locator
+end
+
 describe Mohawk::Navigation do
   context '#on with extra info' do
     When { start_app }
@@ -22,4 +31,12 @@ describe Mohawk::Navigation do
     When(:data_entry_form) { navigate_to(DataEntryForm) }
     Then { expect(data_entry_form).to be_present }
   end
-end
+
+  context 'name the screen that could not be found' do
+    When { Mohawk.timeout = 1 }
+    Then do
+      screen_class = NonExistentScreen
+      expect { on(screen_class) }.to raise_error Mohawk::Waiter::WaitTimeout, "Unable to locate #{screen_class} using #{non_existent_locator}"
+    end
+  end
+end

data/spec/lib/mohawk/waiter_spec.rb

@@ -30,10 +30,22 @@ describe Mohawk::Waiter do
 
   context 'waits in between' do
     When do
-      @fake_responses = [false,  true]
+      @fake_responses = [false, true]
       fake_time 0, 1
     end
 
     Then { expect { waiter.wait_until { do_it } }.not_to raise_error }
   end
-end
+
+  context 'accepts context parameter' do
+    Then { expect { waiter.wait_until(1, 'This is the context') { true } }.not_to raise_error }
+  end
+
+  context 'outputs context on error' do
+    Then do
+      context_string = 'This is the context'
+      expect { waiter.wait_until(1, context_string) { false } }.to raise_error Mohawk::Waiter::WaitTimeout, context_string
+    end
+  end
+
+end

data/spec/lib/mohawk_spec.rb

@@ -46,12 +46,12 @@ describe Mohawk do
     let(:process) { double 'child process', pid: 123 }
 
     before(:each) do
-      Uia.stub(:find_element).and_return double
-      process.stub(:start).and_return(process)
-      [:exited?, :stop].each &process.method(:stub)
-      ChildProcess.stub(:build).with('./the/app/path.exe').and_return(process)
+      allow(Uia).to receive(:find_element).and_return double
+      allow(process).to receive(:start).and_return(process)
+      [:exited?, :stop].each { |x| allow(process).to receive(x) }
+      allow(ChildProcess).to receive(:build).with('./the/app/path.exe').and_return(process)
 
-      window.stub(:present?).and_return(true)
+      allow(window).to receive(:present?).and_return(true)
 
       Mohawk.app_path = './the/app/path.exe'
     end
@@ -131,7 +131,10 @@ describe Mohawk do
   context Mohawk::Adapters do
     Given(:screen) { TestScreen.new }
     Given(:window) { double('window').as_null_object }
-    Given { screen.adapter.stub(:window).and_return window }
+    Given do
+      allow(screen.adapter).to receive(:window).and_return window
+      allow(window).to receive(:present?)
+    end
 
     context 'window' do
       context '#exist?' do

data/spec/lib/navigation_spec.rb

@@ -7,7 +7,7 @@ include Mohawk::Navigation
 
 describe Mohawk::Navigation do
   before(:each) do
-    NavigationTestScreen.stub(:new).and_return(screen)
+    allow(NavigationTestScreen).to receive(:new).and_return(screen)
   end
 
   Given(:screen) { double('Mohawk Screen').as_null_object }

metadata

@@ -1,240 +1,211 @@
 --- !ruby/object:Gem::Specification
 name: mohawk
 version: !ruby/object:Gem::Version
-  version: 0.4.2
-  prerelease: 
+  version: 0.4.3
 platform: ruby
 authors:
 - Levi Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uia
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: page_navigation
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rspec-given
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 2.1.0
 description: Mohawk is a page-object style driver that makes it easy to automate windows
   applications. It allows you to create a very flexible, clean and natural DSL around
   whatever windows application that you are trying to automate using the RAutomation
@@ -245,9 +216,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".travis.yml"
 - Changelog
 - Gemfile
 - Guardfile
@@ -342,33 +313,26 @@ files:
 homepage: http://github.com/leviwilson/mohawk
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 652197775
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 652197775
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.28
+rubygems_version: 2.5.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides a page-object style driver for automating Windows applications
 test_files:
 - features/step_definitions/table_steps.rb