ds-gui-automation 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bba18167638ff674e5c845787aca402c0573185
-  data.tar.gz: fb9056de1ff223e563bdb2f9f47b2ec300bf5944
+  metadata.gz: 4d1900513d8fec3f4271c79b0c36b6a734672dec
+  data.tar.gz: e01a7430ddc49bc1d680615f7d307c7c9ee3c27f
 SHA512:
-  metadata.gz: 2d25173aa90a7521549d0aa5919cced1c1441045aa7fb38b5fedd2a9db1a97fd8310c7bffcc66c7891c8deafd158185805402b0f29db862ae86c507ea20ffcd5
-  data.tar.gz: 9127a13b3d3d9053f33ae98cdbd89892b43efc0fe1a43f1d3281e2d2ac4bfd18a81c62c8a924a83b799923389f0613813db99002f213a04385a258b12efa6eeb
+  metadata.gz: f64bf17dd1771b94bfdc2992a9eb1546b856ef6a2165b43f98e77367acdcf60c0bc8ed1b44c7d1bd8de35c721b13fbbed67f1bc314a26d736b06129d98f8c727
+  data.tar.gz: 16194c6588b167551f24dc789091181fb70a4c5f916080c392cae30faeccccbc4317564d38c8070eb29136afafca23353bb3894a045a355a8aaa71288652a034

data/features/step_definitions/checkout_steps.rb

@@ -198,7 +198,7 @@ When(/^I proceed to checkout$/) do
 
     @browser.a(:class, 'ux-flat-button').click
   else
-    @browser.div(:class, 'ux-my-tickets ux-cart-wrapper').wait_until_present
+    @browser.div(:class, 'ds-cart-content').wait_until_present
 
     sleep 5
 
@@ -206,11 +206,11 @@ When(/^I proceed to checkout$/) do
 
     sleep 2
 
-    (@browser.ul(:class, 'ux-my-tickets-purchases-item-group').lis.size == 2).should be_true
+    (@browser.ul(:class, 'ds-cart-purchases-item-group').lis.size == 2).should be_true
 
     DestinationServicesGUI::Checkout.wait_for_results_cart_spinner
 
-    @browser.div(:class, 'ux-my-tickets-purchases-pricebox').a(:class, 'ux-flat-button ux-red ux-medium').click
+    @browser.a(:class, 'eva-button-primary-large').click
   end
 
 end

data/features/step_definitions/detail_steps.rb

@@ -27,7 +27,15 @@ When(/^I click on the detail button of the corresponding "(.*)"$/) do | tracking
 
   DestinationServicesGUI.set_cookie({'X-Version-Override' => BETA_COOKIES}) if BETA
 
-  DestinationServicesGUI::Results.get_results_by_tracking_id(tracking_id, IS_MODULAR).first.click
+  new_design = @browser.url.include?('Relevance')
+
+  if !new_design
+    puts 'Running with old design'
+    DestinationServicesGUI::Results.get_results_by_tracking_id(tracking_id, IS_MODULAR).first.click
+  else
+    puts 'Running with new design'
+    DestinationServicesGUI::Results.get_results_by_tracking_id_for_new_design(tracking_id,new_design).first.click
+  end
 
 end
 
@@ -36,7 +44,15 @@ When(/^I click on the detail button for cart tour$/) do
 
   DestinationServicesGUI.set_cookie({'X-Version-Override' => BETA_COOKIES}) if BETA
 
-  DestinationServicesGUI::Results.get_results_by_tracking_id(@tour_tracking_id, IS_MODULAR).first.click
+  new_design = @browser.url.include?('Relevance')
+
+  if !new_design
+    puts 'Running with old design'
+    DestinationServicesGUI::Results.get_results_by_tracking_id(@tour_tracking_id, IS_MODULAR).first.click
+  else
+    puts 'Running with new design'
+    DestinationServicesGUI::Results.get_results_by_tracking_id_for_new_design(@tour_tracking_id,new_design).first.click
+  end
 
 end
 
@@ -46,7 +62,15 @@ When(/^I click on the detail button for cart ticket$/) do
 
   DestinationServicesGUI.set_cookie({'X-Version-Override' => BETA_COOKIES}) if BETA
 
-  DestinationServicesGUI::Results.get_results_by_tracking_id(@ticket_tracking_id, IS_MODULAR).first.click
+  new_design = @browser.url.include?('Relevance')
+
+  if !new_design
+    puts 'Running with old design'
+    DestinationServicesGUI::Results.get_results_by_tracking_id(@ticket_tracking_id, IS_MODULAR).first.click
+  else
+    puts 'Running with new design'
+    DestinationServicesGUI::Results.get_results_by_tracking_id_for_new_design(@ticket_tracking_id,new_design).first.click
+  end
 
 end
 
@@ -125,11 +149,11 @@ end
 
 When(/^I add the tour to the cart$/) do
 
-  @browser.span(:class, 'ux-destination-services-cart-button').click
+  @browser.a(:class, 'eva-button-secondary-medium-blockall').click
 
   sleep 5
 
-  @browser.url.include?('cart') ? @browser.div(:class, 'ds-clusters-resume').wait_until_present(30) : @browser.div(:class, 'ux-my-tickets').wait_until_present(30)
+  @browser.url.include?('cart') ? @browser.div(:class, 'ds-clusters-resume').wait_until_present(30) : @browser.div(:class, 'ds-cart-content').wait_until_present(30)
 
 end
 
@@ -137,11 +161,11 @@ When(/^I add the ticket to the cart$/) do
 
   DestinationServicesGUI::Detail.wait_for_disney_loader
 
-  @browser.div(:class,'destination-services-detail-pricebox-add').a(:class, 'ux-flat-button').click
+  @browser.a(:class,'eva-button-secondary-medium-blockall').click
 
   sleep 5
 
-  @browser.url.include?('cart') ? @browser.div(:class, 'ds-clusters-resume').wait_until_present(30) : @browser.div(:class, 'ux-my-tickets').wait_until_present(30)
+  @browser.url.include?('cart') ? @browser.div(:class, 'ds-clusters-resume').wait_until_present(30) : @browser.div(:class, 'ds-cart-content').wait_until_present(30)
 
 end
 
@@ -157,17 +181,17 @@ Then(/^I verify that the first item has been added to the cart$/) do
 
     (@browser.divs(:class, 'ds-clusters-resume').size == 1).should be_true
   else
-    @browser.div(:class, 'ux-my-tickets').wait_until_present
+    @browser.div(:class, 'ds-cart-content').wait_until_present
 
     sleep 5
 
-    @browser.div(:class, 'ux-my-tickets ux-cart-wrapper').hover
+    @browser.div(:class, 'ds-cart-content').hover
 
     DestinationServicesGUI::Checkout.wait_for_results_cart_spinner
 
     sleep 10
 
-    (@browser.ul(:class, 'ux-my-tickets-purchases-item-group').lis.size == 1).should be_true
+    (@browser.ul(:class, 'ds-cart-purchases-item-group').lis.size == 1).should be_true
   end
 
 end

data/features/support/env.rb

@@ -68,11 +68,11 @@ client.timeout = 3000
 process_clean = Henry::ProcessCleaner.new(:zombies => ["#{BROWSER}"])
 process_clean.clean
 
-system "ps aux | grep chrome | awk '{ print $2 }' | xargs -I {} kill -9 {}"
+# system "ps aux | grep chrome | awk '{ print $2 }' | xargs -I {} kill -9 {}"
 
-sleep 3
+# sleep 3
 
-system "ps aux | grep firefox | awk '{ print $2 }' | xargs -I {} kill -9 {}"
+# system "ps aux | grep firefox | awk '{ print $2 }' | xargs -I {} kill -9 {}"
 
 browser_outside = Watir::Browser.new BROWSER.to_sym, :http_client => client
 browser_outside.cookies.clear

data/lib/ds/version.rb

@@ -1,3 +1,3 @@
 module DestinationServicesGUI
-  VERSION = "0.2.18"
+  VERSION = "0.2.19"
 end

data/lib/page_objects/modules/commons.rb

@@ -64,9 +64,11 @@ module Commons
 
     cluster_results = browser.div(:class, 'ux-destination-services-cluster')
 
+    new_design_grid = browser.div(:class, 'eva-grid')
+
     timeout = 0
 
-    while !grid_results.present? and !cluster_results.present? and timeout < 60
+    while !grid_results.present? and !cluster_results.present? and !new_design_grid.present? and timeout < 60
       sleep 3
       timeout += 3
     end
@@ -130,7 +132,7 @@ module Commons
 
   def wait_for_results_cart_spinner
 
-    browser.div(:class, 'ux-my-tickets ux-cart-wrapper').hover
+    browser.div(:class, 'ds-cart-content').hover
 
     timeout = 0
 

data/lib/page_objects/modules/results.rb

@@ -75,6 +75,40 @@ module Results
 
   end
 
+  def get_results_by_tracking_id_for_new_design(trackingId, new_design)
+
+    DestinationServicesGUI.set_cookie({'X-Version-Override' => BETA_COOKIES}) if BETA
+
+    browser.refresh if BETA
+
+    wait_for_results
+
+    current_item_number = browser.divs(:class, 'ds-results-cluster').size
+
+    total_item_number = browser.div(:class, 'ds-results-main-title').text.split.first.to_i
+
+    while current_item_number != total_item_number do
+
+      browser.execute_script("window.scrollBy(0,2000)")
+
+      while browser.div(:class, 'ds-results-desktop-loader').present?
+        sleep 5
+      end
+
+      current_item_number = browser.divs(:class, 'ds-results-cluster').size
+
+    end
+
+    show_results_tracking_id
+
+    clusters = get_clusters_by_tracking_id(trackingId, true, new_design)
+
+    raise "No results found for the specified tracking ID ==> #{trackingId}"  unless !clusters.empty?
+
+    clusters
+
+  end
+
 
   def get_results_by_provider_code(providerCode, isModular = true)
 
@@ -142,11 +176,16 @@ module Results
 
   end
 
-  def get_clusters_by_tracking_id(trackingId, isModular = true)
+  def get_clusters_by_tracking_id(trackingId, isModular = true, new_design = false)
 
     if isModular
-      clusters = browser.divs(:class, 'ux-common-grid-col4 ux-common-grid-col4-large ux-common-grid-col4-medium ux-common-grid-col12-small ux-common-grid-first-small ng-scope').to_a
-      clusters = clusters.select { | cluster | get_tracking_id(cluster).eql?(trackingId)  }
+      if !new_design
+        clusters = browser.divs(:class, 'ux-common-grid-col4 ux-common-grid-col4-large ux-common-grid-col4-medium ux-common-grid-col12-small ux-common-grid-first-small ng-scope').to_a
+        clusters = clusters.select { | cluster | get_tracking_id(cluster).eql?(trackingId)  }
+      else
+        clusters = browser.divs(:class, 'ds-results-cluster').to_a
+        clusters = clusters.select { | cluster | get_tracking_id(cluster).eql?(trackingId)  }
+      end
     else
       clusters = browser.divs(:class, 'ux-destination-services-cluster').to_a
       clusters = clusters.select { | cluster | get_tracking_id(cluster).eql?(trackingId)  }

data/lib/page_objects/modules/tour_detail.rb

@@ -36,7 +36,7 @@ module TourDetail
 
   def go_to_tour_checkout
 
-    button = browser.a(:class, 'ux-flat-button')
+    button = browser.a(:class, 'eva-button-primary-medium-blockall')
 
     button.wait_until_present(30)
 
@@ -45,7 +45,7 @@ module TourDetail
   end
 
   def open_tour_calendar
-    browser.span(:class, 'ux-common-icon-calendar').click
+    browser.div(:class,'ux-common-grid-row date-picker-container').input.click
   end
 
   def go_to_disney_checkout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ds-gui-automation
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Santiago Ochoa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: henry-container