awetestlib 0.1.30pre2-x86-mingw32 → 0.1.30pre3-x86-mingw32

data/lib/version.rb

@@ -1,4 +1,4 @@
 module Awetestlib
-  VERSION = "0.1.30pre2"
-  VERSION_DATE = "2013-05-03"
+  VERSION = "0.1.30pre3"
+  VERSION_DATE = "2013-05-06"
 end

data/setup_samples/sample_cucumber/features/step_definitions/predefined_steps.rb

@@ -1,20 +1,67 @@
-require 'pry'
-
 def awetestlib?
   not Awetestlib::Runner.nil?
 rescue
   return false
 end
 
-Given /^I run with Watir$/ do
-  require 'watir'
-  require 'win32ole'
-  $ai          = ::WIN32OLE.new('AutoItX3.Control')
-  $first_index = 1
+def setup_classic_watir
+    require 'watir'
+    require 'win32ole'
+    $ai          = ::WIN32OLE.new('AutoItX3.Control')
+    $first_index = 1
+    $timestamp     = Time.now.strftime("%Y%m%d%H%M%S")
+    $watir_script = true
+    Watir::IE.close_all
+    Watir::IE.visible = true
+  end
+
+def setup_watir_webdriver
+  require 'watir-webdriver'
+  $first_index = 0
   $timestamp     = Time.now.strftime("%Y%m%d%H%M%S")
-  $watir_script = true
-  Watir::IE.close_all
-  Watir::IE.visible = true
+  $watir_script = false
+end
+
+def open_firefox
+  setup_watir_webdriver
+  @browser = Watir::Browser.new :firefox
+end
+
+def open_chrome
+  setup_watir_webdriver
+  @browser = Watir::Browser.new :chrome
+end
+
+def open_internet_explorer
+  if $watir_script
+    setup_classic_watir
+    @browser       = Watir::IE.new
+    @browser.speed = :fast
+  else
+    setup_watir_webdriver
+    client         = Selenium::WebDriver::Remote::Http::Default.new
+    client.timeout = 300 # seconds – default is 60
+    @browser       = Watir::Browser.new :ie, :http_client => client
+  end
+end
+
+def navigate_to_environment_url
+  if @params and @params['environment'] and @params['environment']['url']
+  url = @params['environment']['url']
+  elsif @login and @login['url']
+    url = @login['url']
+  elsif @role and @login[@role] and @login[@role]['url']
+    url = @login[@role]['url']
+  end
+  @browser.goto url
+end
+
+Given /^I run with Watir$/ do
+  if @params and not @params["browser"] == "IE"
+    puts "@params['browser']=>#{@params['browser']} not compatible with classic Watir. Loading Watir-Webdriver."
+  else
+    setup_classic_watir
+  end
 end
 
 Given /^I run with Classic Watir$/ do
@@ -22,77 +69,59 @@ Given /^I run with Classic Watir$/ do
 end
 
 Given /^I run with Watir-webdriver$/i do
-  require 'watir-webdriver'
-  $first_index = 0
-  $timestamp     = Time.now.strftime("%Y%m%d%H%M%S")
-  $watir_script = false
+  setup_watir_webdriver
 end
 
-
 When /^I open a new browser$/i do
 	if @params
     puts "@params: #{@params}"
 	  case @params["browser"]
       when "FF"
-        step "I open Firefox"
+        open_firefox
       when "IE"
-        step "I open Internet Explorer"
+        open_internet_explorer
       when "C", "GC"
-        step "I open Chrome"
+        open_chrome
 	  end
 	else
-    step "I open Firefox"
+    if $watir_script
+      open_internet_explorer
+    else
+      open_firefox
+    end
   end
-	end
+end
 
 Given /^I open a F?f?irefox B?b?rowser$/i do
-  step "I open Firefox"
+  open_firefox
 end
 
 Given /^I open Firefox$/ do
-  step "I run with Watir-webdriver"
-  @browser = Watir::Browser.new :firefox
+  open_firefox
 end
 
 Given /^I open a C?c?hrome B?b?rowser$/i do
-  step "I open Chrome"
+  open_chrome
 end
 
 Given /^I open Chrome$/ do
-  step "I run with Watir-webdriver"
-  @browser = Watir::Browser.new :chrome	
+  open_chrome
 end
 
 When /^I open an IE B?b?rowser$/i do
-  step "I open Internet Explorer"
+  open_internet_explorer
 end
 
 Given /^I open an I?i?nternet E?e?xplorer B?b?rowser$/i do
-  step "I open Internet Explorer"
+  open_internet_explorer
 end
 
 Given /^I open Internet Explorer$/i do
-  if $watir_script
-    step "I run with Watir"
-    @browser       = Watir::IE.new
-    @browser.speed = :fast
-  else
-    step "I run with Watir-webdriver"
-    client         = Selenium::WebDriver::Remote::Http::Default.new
-    client.timeout = 300 # seconds – default is 60
-    @browser       = Watir::Browser.new :ie, :http_client => client
-  end
+  open_internet_explorer
 end
 
 Then /^I navigate to the environment url$/ do
-  if @params and @params['environment'] and @params['environment']['url']
-  url = @params['environment']['url']
-  elsif @login and @login['url']
-    url = @login['url']
-  elsif @role and @login[@role] and @login[@role]['url']
-    url = @login[@role]['url']
-  end
-  @browser.goto url
+  navigate_to_environment_url
 end
 
 Then /^I go to the url "(.*?)"$/ do |url|
@@ -100,7 +129,7 @@ Then /^I go to the url "(.*?)"$/ do |url|
 end
 
 Then /^I go to the (URL|url)$/ do |dummy|
-  step "I navigate to the environment url"
+  navigate_to_environment_url
 end
 
 Then /^I click "(.*?)"$/ do |element_text|
@@ -204,6 +233,7 @@ Then /^I fill in "(.*?)" with "(.*?)"$/ do |field, value| # assumes a label elem
 end
 
 Then /^let me debug$|^pry$|^execute binding.pry$/ do
+  require 'pry'
   binding.pry
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: awetestlib
 version: !ruby/object:Gem::Version 
-  hash: -223651763
+  hash: -223651761
   prerelease: 6
   segments: 
   - 0
   - 1
   - 30
   - pre
-  - 2
-  version: 0.1.30pre2
+  - 3
+  version: 0.1.30pre3
 platform: x86-mingw32
 authors: 
 - Anthony Woo
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-03 00:00:00 Z
+date: 2013-05-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: watir-webdriver