scoutui 2.0.3.28.pre → 2.0.3.29.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e62490127bd891adcfc389e89e9d66c28f67ca8b
-  data.tar.gz: e230c70a13d642d0941ac7a8daf2e5ef12bb7d80
+  metadata.gz: 5d84c794cae92dd79cce22350ab9384e82ec4569
+  data.tar.gz: bffc895c5992b8bcbbbdfe63d2977fc2d3ac36c7
 SHA512:
-  metadata.gz: fcbde622927e2c78d21f448777f24d89626c41ea0748195b63c80bc487c14cc2451cc88e2c95c0502899cd63fbb5f8e39b5699ba3b524d38eee4e7e854807cf6
-  data.tar.gz: 42b9fc8ebef14155f30e6fbfbf6b4bdd563312db35593522a0f733247037130c7e0524cb3845521a8689ffa34913383f6ce66445ebeaefded2137ab7ffb1da04
+  metadata.gz: d4f33996046dd9dda7e351056b926995877969033b674ad9ba41828cef58de0b11293151fa00448049a4dc0c2a74f8b42bb3c4f543e9b7ab4cb060c4ffc80308
+  data.tar.gz: 1308726062f9fff6cfae328a657bb72571a3a878eb081a703942f21fd42c7b003a1881be52a2c1c825701c2145d597dc65262e10cb6a3a5924faf79c03eafc85

data/examples/converters/jsonupdate.rb

@@ -0,0 +1,31 @@
+
+
+def iterate(h)
+  h.each do |k, v|
+    if v.is_a?(Hash) || v.is_a?(Array)
+      iterate(v)
+    else
+      puts("k is #{k}, value is #{v}")
+      if v.match(/peter/i)
+        h[k]='Elvis'
+      end
+    end
+  end
+end
+
+
+h={
+    'person': {
+        'first': 'Peter',
+        'last': 'Kim',
+        'address': {
+            'city': 'Manhattan peter',
+            'state': 'New York'
+        }
+    }
+}
+
+
+iterate(h)
+
+puts "h => #{h}"

data/examples/ex6/tests/test.sh

@@ -34,7 +34,7 @@ setup()
   CMD="../commands/basic_search.yml"
 
   CMD="../commands/home.commands.yml"
-
+CMD="../commands/cud.yml"
 }
 
 

data/lib/scoutui/base/assertions.rb

@@ -27,6 +27,11 @@ module Scoutui::Base
       _a.is_a?(String) && _a.match(/^\s*[!]*(isSelected|selected)\((.*)\)\s*$/i)
     end
 
+
+    def isTitleCmd?(_a)
+      _a.is_a?(String) && _a.match(/^\s*[!]*(isTitle|title)\s*\((.*)\)\s*$/i)
+    end
+
     def isValueCmd?(_a)
       _a.is_a?(String) && _a.match(/^\s*(value|text)\s*\(.*\)\s*\=\s*(.*)/i)
     end
@@ -35,6 +40,24 @@ module Scoutui::Base
       _a.is_a?(String) && _a.match(/^\s*[!]*visible\((.*)\)\s*$/i)
     end
 
+
+    def isTitle(my_driver, _execute_when)
+
+      rc=nil
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isTitle(#{_execute_when}"
+
+      _locator = _execute_when.match(/^\s*[!]*(isTitle|title)\((.*)\)\s*$/i)[2].to_s
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isTitle => #{_locator}"
+
+      current_title = my_driver.title
+      expected_title = Regexp.new(_locator)
+      rc=!expected_title.match(current_title).nil?
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isTitle?(#{_execute_when}) => #{rc}"
+      rc
+    end
+
     def isValue?(my_driver, page_elt)
 
       rc = false
@@ -59,12 +82,12 @@ module Scoutui::Base
         puts __FILE__ + (__LINE__).to_s + " #{condition} : #{obj}"
 
         if !obj.nil?
-          if condition.match(/^text/)
+          if condition.match(/^\s*text/)
             _txt = obj.text
             Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " text : #{_txt}"
             expected_regex = Regexp.new(expectedVal)
             rc =  !_txt.to_s.match(expected_regex).nil?
-          elsif condition.match(/^value/)
+          elsif condition.match(/^\*value/)
             _txt = obj.attribute('value')
             expected_regex = Regexp.new(expectedVal)
             rc =  !_txt.to_s.match(expected_regex).nil?

data/lib/scoutui/base/visual_test_framework.rb

@@ -314,25 +314,68 @@ module Scoutui::Base
 
     end
 
-
     def self.processAssertions(my_driver, e)
+      processConditions(my_driver, e, 'assertions')
+    end
+
+    def self.processAsserts(my_driver, _execute_when)
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " processAsserts#{_execute_when}"
+
+      _executeIt=true
+
+      if !_execute_when.nil? && _execute_when.is_a?(Array)
+
+        _req = Scoutui::Utils::TestUtils.instance.getReq()
+
+        _execute_when.each do |_a|
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " exeucute_when => #{_a}"
+
+          _rc=nil
+
+          if Scoutui::Base::Assertions.instance.isEnabledCmd?(_a)
+            _rc=Scoutui::Base::Assertions.instance.isEnabled?(my_driver, _a)
+          elsif Scoutui::Base::Assertions.instance.isRoleCmd?(_a)
+            _rc=Scoutui::Base::Assertions.instance.isRole?(_a)
+          elsif Scoutui::Base::Assertions.instance.isVisibleCmd?(_a)
+            _rc=Scoutui::Base::Assertions.instance.isVisible?(my_driver, _a)
+          elsif Scoutui::Base::Assertions.instance.isSelectedCmd?(_a)
+            _rc=Scoutui::Base::Assertions.instance.isSelected?(my_driver, _a)
+          elsif Scoutui::Base::Assertions.instance.isValueCmd?(_a)
+            _rc=Scoutui::Base::Assertions.instance.isValue?(my_driver, _a)
+          elsif Scoutui::Base::Assertions.instance.isTitleCmd?(_a)
+            _rc=Scoutui::Base::Assertions.instance.isTitle(my_driver, _a)
+          end
+
+          if !_rc.nil?
+            Scoutui::Logger::LogMgr.instance.asserts.info __FILE__ + (__LINE__).to_s + "Verify #{_a} - #{_rc}"
+            Testmgr::TestReport.instance.getReq(_req).get_child('visible_when').add(_rc, "Verify #{_a}")
+          end
+
+        end
+      end
+
+    end
+
+
+    def self.processConditions(my_driver, e, _conditionType)
       Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " === ProcessAssertions(#{e.to_s} ====" if Scoutui::Utils::TestUtils.instance.isDebug?
 
-      if !e[STEP_KEY].has_key?('assertions')
+      if !e[STEP_KEY].has_key?(_conditionType)
         return
       end
 
-      if !e[STEP_KEY]['assertions'].is_a?(Array)
+      if !e[STEP_KEY][_conditionType].is_a?(Array)
         Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " \'assertions\' field must be type Array."
         return
       end
 
       _req = Scoutui::Utils::TestUtils.instance.getReq()
 
-      puts __FILE__ + (__LINE__).to_s + "======= #{e[STEP_KEY]['assertions']} ========="
+      puts __FILE__ + (__LINE__).to_s + "======= #{e[STEP_KEY][_conditionType]} ========="
 
 
-      e[STEP_KEY]['assertions'].each do |elt|
+      e[STEP_KEY][_conditionType].each do |elt|
 
         begin
 
@@ -970,24 +1013,31 @@ module Scoutui::Base
             processExpected(my_driver, e)
 
             processAssertions(my_driver, e)
+            processAsserts(my_driver, e[STEP_KEY]["asserts"])
 
             if e[STEP_KEY].has_key?('saveas')
               # processSaveAs(e)
 
-              puts __FILE__ + (__LINE__).to_s + " == Process SaveAs =="
               _saveAs = e[STEP_KEY]['saveas']['file'].to_s
+
+              puts __FILE__ + (__LINE__).to_s + " == Process SaveAs #{_saveAs}=="
+
               _f=File.open(_saveAs, 'w')
 
-              if e[STEP_KEY]['saveas']['data'].match(/.*\.json$/)
-                _f.puts e[STEP_KEY]['saveas']['data'].to_json
-              elsif e[STEP_KEY]['saveas']['data'].match(/.*\.(yml|yaml)$/)
+              if _saveAs.match(/.*\.json\s*$/)
+               # _f.puts e[STEP_KEY]['saveas']['data'].to_json
+                _f.puts Scoutui::Utils::TestUtils.instance.expandVars(e[STEP_KEY]['saveas']['data'])
 
-            #    y_file = File.open("#{$yaml_file}", 'a')
-                _f.write(YAML.dump(JSON.parse(IO.read($json_file))))
-                y_file.close
+              elsif _saveAs.match(/.*\.(yml|yaml)\s*$/)
 
+            #    y_file = File.open("#{$yaml_file}", 'a')
+                puts __FILE__ + (__LINE__).to_s + " Generate a YAML file"
+             #   _f.write(e[STEP_KEY]['saveas']['data'].to_yaml)
 
-                _f.puts e[STEP_KEY]['saveas']['data'].to_json
+                _f.write(Scoutui::Utils::TestUtils.instance.expandVars(e[STEP_KEY]['saveas']['data'].to_yaml))
+                _f.close
+              else
+                __FILE__ + (__LINE__).to_s + " Unknown file extension."
               end
 
               _f.close

data/lib/scoutui/utils/utils.rb

@@ -513,6 +513,55 @@ module Scoutui::Utils
       @options[:title]
     end
 
+
+    def transpile(_val)
+      _uservars = _val.scan(/\$\{(.*?)\}/)
+
+      _v2 = _val
+      for i in 0 .. (_uservars.size - 1)
+
+        _t = Scoutui::Base::UserVars.instance.get(_uservars[i][0])
+        puts __FILE__ + (__LINE__).to_s + " translate(#{_uservars[i][0]}) => #{_t}"
+
+        if !_t.nil? && _uservars[i][0]!=_t
+          _v2.gsub!("\$\{#{_uservars[i][0]}\}", _t)
+        end
+
+        puts __FILE__ + (__LINE__).to_s + " value => #{_v2}"
+
+      end
+
+      ## Global replaces
+      _text_to_type = Scoutui::Base::UserVars.instance.get(_v2)
+
+      puts __FILE__ + (__LINE__).to_s + " rawText : #{_text_to_type}"
+      _text_to_type = Scoutui::Commands::Utils.instance.expandMacro(_text_to_type)
+      puts __FILE__ + (__LINE__).to_s + " Text to type : #{_text_to_type}"
+
+      _text_to_type
+    end
+
+
+
+    def expandVars(h)
+
+      puts __FILE__ + (__LINE__).to_s + " expandVars(#{h})"
+
+      h.each do |k, v|
+        if v.is_a?(Hash) || v.is_a?(Array)
+          expandVars(v)
+        else
+          puts("k is #{k}, value is #{v}")
+
+          h[k]=transpile(v)
+        end
+      end
+
+      h
+    end
+
+
+
   end
 
 

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.28.pre"
+  VERSION = "2.0.3.29.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.28.pre
+  version: 2.0.3.29.pre
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,6 +191,7 @@ files:
 - examples/carmax/commands/commands.yml
 - examples/carmax/tests/test-carmax.sh
 - examples/ci_reporter/ci_example.rb
+- examples/converters/jsonupdate.rb
 - examples/converters/jsony.rb
 - examples/ex1/commands.holidays.yml
 - examples/ex1/commands.yml