oct-automation-utilities 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52de89a38f0b401322f454f4db622910978a0b39
-  data.tar.gz: a8c72484060b8989421192ef2e4ceeb66d3ebae9
+  metadata.gz: 51ae10f24d475087473d2f8ed42c9a91129af2f7
+  data.tar.gz: 33ec1aa6bc9fdad71c3d044c6e16144da93b3373
 SHA512:
-  metadata.gz: 5052710f90459b8422115b439665b989bf16ba147dffa9d1b683fbc644d11f41845d370a3d70e08a3a8efbea26e671ae92c69943d66e61e7dc0c18fd63876f46
-  data.tar.gz: eac2e6109a68c76f006cda580d6c9449c6fbc7030707fe3061cb39b5f9fc6579f17158c7dc1a99118113b6c0c319983de47d4c4ddef96df51d1b5abe9a433d77
+  metadata.gz: 9379213986ef882df2099096c104d4f472b8e71ea611bdda06f9f6520a864248a12797409c1aab50c500ce037c8785e99aa807bfaff037ef8a48e9f676078cd2
+  data.tar.gz: 3c62c72c64698f16af73d2ba1e7478f63923545efc047efb8a8a87cb037157852eb696c10979cf12d831d6582048daa20d0f8998a68599e3b6f325799d76ed37

data/lib/oct-automation-utilities.rb

@@ -8,6 +8,7 @@ module OctAutomationUtilities
   class Utilities
     include Capybara::DSL
     include Capybara::RSpecMatchers
+    include ::RSpec::Matchers
 
     #test data
     attr_accessor :capture_screen, :screen_shot_path, :exe_time, :test_name, :project_directory, :test_time
@@ -91,11 +92,11 @@ module OctAutomationUtilities
     end
 
     def verify_page_content(content = '')
-      page.should_not have_content 'HTTP Status'
+      expect(page).to_not have_content('HTTP Status')
       if content != nil
         self.obj_expected_page_content = content
       end
-      page.should have_content(self.obj_expected_page_content)
+      expect(page).to have_content(self.obj_expected_page_content)
      self.capture_screen_shot("Verify content - #{self.obj_expected_page_content}")
     end
 
@@ -136,20 +137,16 @@ module OctAutomationUtilities
     end
 
     def close_current_window
-      secondwindow = windows[page.driver.browser.window_handles.length - 1]
-      page.switch_to_window(windows[0])
-      within_window(secondwindow) do
-        page.current_window.close
-      end
-      self.switchtonewlyopenedwindow
+      Capybara.reset_sessions! # Guarantees the session ID/Cache is cleared.
+      page.driver.browser.switch_to.window(page.driver.browser.window_handles.last)
+      page.execute_script "window.close();"
+      page.driver.browser.switch_to.window(page.driver.browser.window_handles.first)
     end
 
     def close_all_windows
-      current_windows = page.driver.browser.window_handles
-      current_windows.each do |window_name|
-        page.within_window window_name do
-          page.current_window.close
-        end
+        page.driver.browser.window_handles.each do |handle|
+        page.driver.browser.switch_to.window(page.driver.browser.window_handles.last)
+        page.execute_script "window.close()"
       end
     end
 
@@ -414,8 +411,7 @@ module OctAutomationUtilities
     end
 
     def switchtonewlyopenedwindow
-      new_window = page.driver.browser.window_handles.last
-      page.driver.browser.switch_to.window(new_window)
+      page.driver.browser.switch_to.window(page.driver.browser.window_handles.last)
     end
 
   end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: oct-automation-utilities
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Aaron Tracy
+- Nick Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies: []
 description: Utilities class that performs common automation functionality that can
   be used over multiple projects