taf 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc027375cb1080bd59899a22d3031d94c7c01f290bf038e3405817bd9f5a0917
-  data.tar.gz: c33164d59b1b513d21d151308ea047cb5ae1b9dcb6262c2f8e5d49bc86dbcb15
+  metadata.gz: 7708523ab29d3c19ee1d77c632c8059b22bd5f0bc53c4f1c44cdcaad3bdde2de
+  data.tar.gz: b37e08f02f1e1898e1bbd0c1acdd1c7d66d654885ec3dff5f8fe63a366236be2
 SHA512:
-  metadata.gz: 64ba1aea3db08ae4635daf4bae64fa041edf1f189bcb8aa140ecf2a12d9f896a2225ecfdf6caca83e29a7aa7572e88233dfe7a09461956804c7c98255aa65e73
-  data.tar.gz: 8c70b235958f5bf237e0522526736e71cd0cfd87d757e949e9c650d783a936f132ee8179008614035b7db53fe99c9e6dd0234bbc2c8ed23b96237b961a64fa13
+  metadata.gz: 69bfe9f27d479f1bbc0cdf409ff6b86c134a49ad5f74cba6c0e28e8dd0b2389447645bfaa2de6c329eecc415106451e6c6a4e79e701f29508ed34cc4716ed1ad
+  data.tar.gz: b8fe981921bab3a1f71cb354b64a4a140dc5a30d16872e54f7029f51758d23b9f785443dae70c643535cc6f5697ca2a3af97d805b3616990d438adcaaf914a0b

data/lib/functions/handlers/base_handler.rb

@@ -47,7 +47,7 @@ module TestSteps
       end
 
       def mem_word_check(user, b_title_sucess)
-        if Browser.b.title.eql?('Memorable word - UKCloud Portal')
+        if Browser.b.title.eql?('Memorable word ')
           portal_mem_word(user, b_title_sucess)
         elsif Browser.b.title.eql?(b_title_sucess)
           MyLog.log.info("User: #{user} has logged in successful.")

data/lib/functions/handlers/open_url.rb

@@ -9,14 +9,23 @@ module TestSteps
         url = step_attributes[:testvalue]
 
         Browser.open_browser
+
+        url = if ENV[url]
+                ENV[url.to_s]
+              else
+                step_attributes[:testvalue]
+              end
         Browser.b.goto(url)
-        sleep 2
-        url_nme = Browser.b.url
-        if url_nme == url
+        OpenUrl.check_current_url(url)
+      end
+
+      def self.check_current_url(url)
+        url_check = Browser.b.url
+        if url_check == url
           MyLog.log.info("Opened URL: #{url}")
           return true
         else
-          MyLog.log.warn("URL not open: #{url} - opened #{url_nme} instead")
+          MyLog.log.warn("URL not open: #{url} - opened #{url_check} instead")
           return false
         end
       end

data/lib/functions/handlers/write_box_data.rb

@@ -10,9 +10,15 @@ module TestSteps
         value = step_attributes[:testvalue2]
         locate = step_attributes[:locate]
 
+        text = ENV[value.to_s] || step_attributes[:testvalue2]
+        WriteBoxdata.input_value(box, text, locate)
+      end
+
+      def self.input_value(box, text, locate)
         found_box = [
           Browser.b.textarea(:"#{locate}" => box).exist?,
-          Browser.b.text_field(:"#{locate}" => box).exist?
+          Browser.b.text_field(:"#{locate}" => box).exist?,
+          Browser.b.iframe(:"#{locate}" => box).exist?
         ]
 
         raise 'Multiple matches' if found_box.select { |i| i }.empty?
@@ -21,16 +27,18 @@ module TestSteps
         return unless index
 
         if index.zero?
-          Browser.b.textarea(:"#{locate}" => box).wait_until(&:exists?).set value
-          (Browser.b.textarea(:"#{locate}" => box).value == value)
+          Browser.b.textarea(:"#{locate}" => box).wait_until(&:exists?).set text
+          (Browser.b.textarea(:"#{locate}" => box).text == text)
         elsif index == 1
-          Browser.b.text_field(:"#{locate}" => box).wait_until(&:exists?).set value
-          (Browser.b.text_field(:"#{locate}" => box).value == value)
+          Browser.b.text_field(:"#{locate}" => box).wait_until(&:exists?).set text
+          (Browser.b.text_field(:"#{locate}" => box).text == text)
+        elsif index == 2
+          Browser.b.iframe(:"#{locate}" => box).wait_until(&:exists?).send_keys text
         end
-        MyLog.log.info("Textbox: #{box} has correct value: #{value}")
+        MyLog.log.info("Textbox: #{box} has correct value: #{text}")
         true
       rescue StandardError
-        MyLog.log.warn("Textbox: #{box} has the incorrect value: #{value}")
+        MyLog.log.warn("Textbox: #{box} has the incorrect value: #{text}")
         false
       rescue StandardError
         MyLog.log.warn("Textbox: #{box} does not exist")

data/lib/report/junit_report.rb

@@ -58,19 +58,8 @@ module JunitReport
       end
     end
 
-    # output XML content to console for debug
-    # puts builder.to_xml
-
-    # open the test suite (TS) summary file for writing if not already open
-    if !File.exist?($TestSuiteSummaryXML) || $TestSuiteSummaryXML.closed?
-      ts_summary_file_xml = File.open($TestSuiteSummaryXML, 'w+')
-      ts_summary_file_xml.write builder.to_xml
-    else
-      MyLog.log.warn 'test suite summary file xml name:' \
-        " #{$TestSuiteSummaryXML} is already open"
-    end
-
-    # if the file is open then close it
-    ts_summary_file_xml.close unless ts_summary_file_xml.closed?
+    ts_summary_file_xml = File.open($TestSuiteSummaryXML, 'w')
+    ts_summary_file_xml.write builder.to_xml
+    ts_summary_file_xml.close
   end
 end

data/lib/version.rb

@@ -3,7 +3,7 @@
 module Taf
   # This module holds the TAF version information.
   module Version
-    STRING = '0.2.3'
+    STRING = '0.2.4'
 
     MSG = '%<version>s (using Parser %<parser_version>s, running on ' \
           '%<ruby_engine>s %<ruby_version>s %<ruby_platform>s)'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taf
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Andy Perrett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,7 +189,6 @@ files:
 - lib/functions/handlers/click_button.rb
 - lib/functions/handlers/execute_system_command.rb
 - lib/functions/handlers/handle_browser_window.rb
-- lib/functions/handlers/insert_value_config.rb
 - lib/functions/handlers/ipause.rb
 - lib/functions/handlers/list_all_dropdowns_values.rb
 - lib/functions/handlers/open_url.rb
@@ -198,9 +197,7 @@ files:
 - lib/functions/handlers/radio_button.rb
 - lib/functions/handlers/select_dropdown.rb
 - lib/functions/handlers/send_special_keys.rb
-- lib/functions/handlers/switch_iframe.rb
 - lib/functions/handlers/write_box_data.rb
-- lib/functions/handlers/write_to_editor.rb
 - lib/main.rb
 - lib/parser/parser.rb
 - lib/parser/xlsx_parser.rb
@@ -234,8 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: TAF to allow simple web automation.

data/lib/functions/handlers/insert_value_config.rb

@@ -1,27 +0,0 @@
-require_relative 'base_handler'
-
-module TestSteps
-  module Handlers
-    class InsertValueConfig < Base
-      register :insert_value_config
-
-      def perform(step_attributes)
-        box = step_attributes[:testvalue]
-        locate = step_attributes[:locate]
-        value = step_attributes[:testvalue2]
-        value = ENV[value.to_s]
-
-        Browser.b.text_field(:"#{locate}" => box).wait_until.set value
-        (Browser.b.text_field(:"#{locate}" => box).value == value)
-        MyLog.log.info("Textbox: #{box} has correct value: #{value}")
-        true
-      rescue StandardError
-        MyLog.log.warn("Textbox: #{box} has the incorrect value: #{value}")
-        false
-      rescue StandardError
-        MyLog.log.warn("Textbox: #{box} does not exist")
-        false
-      end
-    end
-  end
-end

data/lib/functions/handlers/switch_iframe.rb

@@ -1,23 +0,0 @@
-require_relative 'base_handler'
-
-module TestSteps
-  module Handlers
-    class SwitchIframe < Base
-      register :switch_iframe
-
-      def perform(step_attributes)
-        frame = step_attributes[:testvalue]
-        locate = step_attributes[:locate]
-
-        Browser.b.iframe(:"#{locate}" => frame).exists?
-        # Browser.b.wait_until { iframe(:"#{locate}" => frame).exists? }
-        # Browser.b.switch_to(:"#{locate}" => iframe)
-        MyLog.log.info("iframe found: #{frame} is correct")
-        true
-      rescue StandardError
-        MyLog.log.warn("iframe not found: #{frame}")
-        false
-      end
-    end
-  end
-end

data/lib/functions/handlers/write_to_editor.rb

@@ -1,26 +0,0 @@
-require_relative 'base_handler'
-
-module TestSteps
-  module Handlers
-    class WriteToEditor < Base
-      register :write_to_editor
-
-      def perform(step_attributes)
-        iframe = step_attributes[:testvalue]
-        value = step_attributes[:testvalue2]
-        locate = step_attributes[:locate]
-
-        Browser.b.iframe(:"#{locate}" => iframe).wait_until(&:exists?)
-        Browser.b.iframe(:"#{locate}" => iframe).send_keys value
-        MyLog.log.info("Editor box: #{iframe} has correct value: #{value}")
-        true
-      rescue StandardError
-        MyLog.log.warn("Editor box: #{iframe} has wrong value: #{value}")
-        false
-      rescue StandardError
-        MyLog.log.warn("Editor box: #{iframe} does not exist")
-        false
-      end
-    end
-  end
-end