marta 0.26150 → 0.28017

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23b20fe634d3cc98a3adbb3997269c9687256b23
-  data.tar.gz: d9644a0f8c01d32f4d25c9f67e1b30482a24ec98
+  metadata.gz: 89341581be4f3b0b1ebf57de01d8e583748ac7c5
+  data.tar.gz: ff147c84a554e8ec66b3f94f0a1016bfb364cc7c
 SHA512:
-  metadata.gz: 1ba5036b4d3350b73cc4004e39af27c9af90dd67ad89f9efac0e9937f54bcccba7463dc0156aa2ab7bced7702c08f823498edeb895d8c67b7a6cd7f28715b89a
-  data.tar.gz: 2eb03fb937126b707e5290a765dc50314701301548389d5b8baf982316e5b542e694f719cbf38fbd21acb45dc691e276520df30e0ce847f4ee9fda4bd36dc65b
+  metadata.gz: 6abbbd0b0b39235df76bd6fa6abaaea92227fb4ede3a51f9ba65c6e0f6d86488dcc7430e9b52a3070099a90118acbda9fd00272e3c91c3af66920b116cc26d04
+  data.tar.gz: 4cd9c90457d6ef3dd77b924048b6b9fa6c5f125f2753c71b72502e566ce2c9b9762d4b8ad03e54dbcbd5952dee26d5093e870ac021e1252b6a46be7fca1d918b

data/README.md

@@ -1,6 +1,6 @@
 # Marta
 
-Marta is a pretty new way to write selenium tests for WEB applications using Watir. Main idea is very similar to cucumber. In Cucumber you are writing test and then defining a code behind it. In Marta you are writing code and then defining classes/pageobjects and methods/elements behind it thru your browser window.
+Marta was planned as an element locating tool for Watir tests. But now Marta is also a pretty new way to write selenium tests for WEB applications using Watir. Main idea is very similar to cucumber. In Cucumber you are writing test and then defining a code behind it. In Marta you are writing code and then defining classes/pageobjects and methods/elements behind it thru your browser window.
 
 Also Marta is providing a little more stability when locating elements on the page.
 
@@ -193,7 +193,7 @@ g_page.search "I am in love with selenium."
 
 **Q: What else?**
 
-*A: Nothing. Marta is under development. Her version is 0.26150 only. And I am not a professional developer. But I am training her on new tricks.*
+*A: Nothing. Marta is under development. Her version is 0.28017 only. And I am not a professional developer. But I am training her on new tricks.*
 
 ## Internal Design
 

data/lib/marta/data/custom-xpath.js

@@ -1,7 +1,6 @@
 var marta_result = {};
 var marta_confirm_mark = false;
 var marta_temp_els =[];
-var marta_temp_styles = [];
 
 function marta_add_data() {
     marta_confirm_mark = false;
@@ -11,18 +10,16 @@ function marta_add_data() {
 function marta_look() {
   try {
     for (var i=0; i<marta_temp_els.snapshotLength; i++) {
-      marta_temp_els.snapshotItem(i).setAttribute("style",marta_temp_styles[i]);
+      marta_temp_els.snapshotItem(i).removeAttribute("martaclass");
     };
     var t=0;
     var value = document.getElementById("marta_user_xpath").value;
     var result = document.evaluate(value, document.body, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
     marta_temp_els = result;
-
     for (var i=0; i<result.snapshotLength; i++) {
       var marta_smthing = ((result.snapshotItem(i).getAttribute("martaclass")=="marta_smthing")||(result.snapshotItem(i).getAttribute("martaclass")=="marta_div"));
       if(!marta_smthing) {
-        marta_temp_styles[i]  = result.snapshotItem(i).getAttribute("style");
-        result.snapshotItem(i).setAttribute("style","animation: marta_found 6s infinite;");
+        result.snapshotItem(i).setAttribute("martaclass","foundbymarta");
         t = t+1;
       };
     };
@@ -33,6 +30,9 @@ function marta_look() {
 };
 
 function marta_confirm(){
+    for (var i=0; i<marta_temp_els.snapshotLength; i++) {
+      marta_temp_els.snapshotItem(i).removeAttribute("martaclass");
+    };
     marta_result["collection"] = document.getElementById("marta_array").checked;
     marta_result["xpath"] = document.getElementById("marta_user_xpath").value;
     var toClear = document.querySelector("[martaclass=marta_smthing]");
@@ -41,6 +41,9 @@ function marta_confirm(){
 };
 
 function marta_try_again(){
+    for (var i=0; i<marta_temp_els.snapshotLength; i++) {
+      marta_temp_els.snapshotItem(i).removeAttribute("martaclass");
+    };
     var toClear = document.querySelector("[martaclass=marta_div]");
     toClear.parentNode.removeChild(toClear);
     marta_confirm_mark = true;

data/lib/marta/data/element.html

@@ -11,7 +11,8 @@
     <p martaclass=marta_smthing>Find it like a usual element and focus to it in code with dance_with(your_iframe)</p>
   </div>
   <div id=marta_s_content martaclass=marta_smthing>
-    <input type=button martaclass=marta_smthing id=marta_confirm onclick=marta_confirm(); value=Confirm />
+    <input type=button martaclass=marta_smthing id=marta_confirm onclick=marta_end_loop(); value=Confirm />
+    <input type=button martaclass=marta_smthing id=marta_set_by_hand onclick=marta_set_by_hand(); value="Set by hand" />
   </div>
   <div id=marta_s_element_type martaclass=marta_smthing>
     <div martaclass=marta_smthing class=label id=marta_element_label>What we are looking for (one element or group?)</div>

data/lib/marta/data/element.js

@@ -57,6 +57,7 @@ function marta_change_field(field){
       marta_result[data[0]][data[1]][parseInt(data[2])]=field.value;
     };
   };
+  marta_confirm();
 };
 
 function marta_confirm(){
@@ -84,7 +85,7 @@ function marta_confirm(){
 function marta_add_data() {
   marta_result = old_marta_Data;
     marta_confirm_mark = false;
-    document.getElementById("marta_main_title").innerHTML = "You are defining " + marta_what;
+    document.getElementById("marta_main_title").innerHTML = marta_what;
     if (old_marta_Data != {}){
       try {
         document.getElementById("marta_array").checked = old_marta_Data["options"]["collection"];}
@@ -131,6 +132,7 @@ function marta_click_work(e, iframe=false) {
           e.stopPropagation();
           e.preventDefault();
         };
+        marta_confirm();
     };
 };
 
@@ -142,7 +144,7 @@ function marta_after_click(el, what) {
     marta_add_field("TAG", what, marta_result["options"][what], "taggy");
     for (var att, i = 0, atts = el.attributes, n = atts.length; i < n; i++){
       att = atts[i];
-      if(/^[a-zA-Z0-9- _!@#$%^*();:,.?/]*$/.test(att.nodeValue) == true){
+      if(/^[a-zA-Z0-9- _!@#$%^*();:,.?/]*$/.test(att.nodeValue) == true && att.nodeName != "martaclass"){
         if (/class/.test(att.nodeName) == true){
           var values=att.nodeValue.split(" ");
           marta_result[what][att.nodeName]=[];
@@ -180,4 +182,20 @@ function marta_delete_line(line) {
     marta_change_field(field);
     title.parentNode.removeChild(title);
     staff.parentNode.removeChild(staff);
-  };
+};
+
+function marta_set_by_hand(){
+    var toClear = document.querySelector("[martaclass=marta_div]");
+    toClear.parentNode.removeChild(toClear);
+    marta_confirm_mark = true;
+    marta_result = "3";
+};
+
+function marta_end_loop(){
+    if (marta_room != 0){
+      var toClear = document.querySelector("[martaclass=marta_smthing]");
+      toClear.parentNode.removeChild(toClear);
+      marta_confirm_mark = true;
+      marta_result = "1";
+    }
+};

data/lib/marta/data/style.css

@@ -81,7 +81,7 @@ div#marta_s_everything *, div#marta_s_everything {
   empty-cells : show;
   float : none;
   font : normal;
-  font-family : inherit;
+  font-family : sans-serif;
   font-size : medium;
   font-style : normal;
   font-variant : normal;
@@ -206,4 +206,8 @@ div#marta_s_everything input[type=checkbox]
             background-repeat:no-repeat;
             background-position: 0 0;
             font-size:16px;
-            vertical-align:middle;}
+            vertical-align:middle;
+}
+[martaclass=foundbymarta]
+  {animation: marta_found 6s infinite;
+}

data/lib/marta/dialogs.rb

@@ -3,6 +3,7 @@ require 'marta/x_path'
 require 'marta/lightning'
 require 'marta/injector'
 require 'marta/public_methods'
+
 module Marta
 
   #
@@ -28,6 +29,9 @@ module Marta
         @data = data
         @title = class_name+  '.' + method_name.to_s
         @requestor = requestor
+        @found = 0
+        @attrs = @data['meths'][@method_name]
+        @mass = Array.new
       end
 
       # Standart question
@@ -35,15 +39,29 @@ module Marta
         inject(what, title, data)
       end
 
+      # Was something stated by user?
+      def attrs_exists?
+        if !@attrs.nil?
+          @attrs != Hash.new
+        else
+          false
+        end
+      end
+
       # Main method. All the dialog logic is here
       def dialog
         while !finished? do
-          @attrs = ask_for_elements
-          @mass = get_elements_by_attrs
-          @styles = mass_highlight_turn @mass
-          @result = ask_confirmation
-          mass_highlight_turn(@mass, false, @styles)
+          if attrs_exists?
+            @mass = get_elements_by_attrs
+            mass_highlight_turn @mass
+          end
+          @result = ask_for_elements
+          if @result.class == Hash
+            @attrs = @result
+          end
+          mass_highlight_turn(@mass, false)
         end
+
         if @result == '1'
           standart_meth_merge
         else
@@ -53,7 +71,7 @@ module Marta
 
       # Asking: "What are you looking for?"
       def ask_for_elements
-        ask 'element', @title, @data['meths'][@method_name]
+        ask 'element', "Found #{@found} elements for #{@title}", @attrs
       end
 
       # Creating data to save when it is a basically defined element
@@ -74,8 +92,14 @@ module Marta
 
       # Finding out what was selected
       def get_elements_by_attrs
-        xpath = XPathFactory.new(@attrs, @requestor).generate_xpath
-        engine.elements(xpath: xpath)
+        if @attrs['options']['xpath'].nil?
+          xpath = XPathFactory.new(@attrs, @requestor).generate_xpath
+        else
+          xpath = @attrs['options']['xpath']
+        end
+        result = engine.elements(xpath: xpath)
+        @found = result.length
+        result
       end
 
       # Asking: "Are you sure?"
@@ -97,13 +121,27 @@ module Marta
         if @result == '1'
           true
         elsif @result == '3'
-          @result = ask_xpath
-          (@result != '2') ? true : false
+          xpath_way
         else
           false
         end
       end
 
+      # When user selects xpath way. Marta is doing some work before finish
+      def xpath_way
+        @result = ask_xpath
+        if @result == '2'
+          false
+        else
+          @attrs['options'] = @result
+          @mass = get_elements_by_attrs
+          mass_highlight_turn @mass
+          @result = ask_confirmation
+          mass_highlight_turn(@mass, false)
+          finished?
+        end
+      end
+
       # Forming of an empty hash for storing element info
       def temp_hash
         temp, temp['meths'], temp['meths'][@method_name],

data/lib/marta/lightning.rb

@@ -7,30 +7,25 @@ module Marta
 
     # We can highlight an element
     def highlight(element)
-      orig_style = element.attribute_value("style")
-      engine.execute_script("arguments[0].setAttribute(arguments[1],"\
-                            " arguments[2])", element, "style",
-                            "animation: marta_found 6s infinite;")
-      orig_style
+      engine.execute_script("arguments[0].setAttribute"\
+                            "('martaclass','foundbymarta')", element)
     end
 
     # We can unhighlight an element
-    def unhighlight(element, style)
-      engine.execute_script("arguments[0].setAttribute(arguments[1],"\
-                            " arguments[2])", element, "style", style)
+    def unhighlight(element)
+      engine.execute_script("arguments[0].removeAttribute('martaclass')",
+                            element)
     end
 
     # We can highlight\unhighlight tons of elements at once
-    def mass_highlight_turn(mass, turn_on = true, styles = nil)
-      result = Array.new
+    def mass_highlight_turn(mass, turn_on = true)
       mass.each_with_index do |element, i|
         if turn_on
-          result[i] = highlight(element)
+          highlight element
         else
-          unhighlight(element, styles[i])
+          unhighlight element
         end
       end
-      result
     end
   end
 end

data/lib/marta/version.rb

@@ -1,4 +1,4 @@
 module Marta
-  VERSION = "0.26150"
+  VERSION = "0.28017"
   NAME = "marta"
 end

data/marta.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["s_seleznev_qa@hotmail.com"]
 
   spec.summary       = "That will be an another one watir-webdriver wrap"
-  spec.description   = "It's nothing to describe now."
+  spec.description   = "Element location tool for your watir autotests"
   spec.homepage      = "https://github.com/sseleznevqa/marta"
   spec.license       = "MIT"
 
@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "simplecov"
   spec.add_dependency "watir"
   #spec.add_dependency "fileutils"
   spec.add_dependency "json"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marta
 version: !ruby/object:Gem::Version
-  version: '0.26150'
+  version: '0.28017'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: It's nothing to describe now.
+description: Element location tool for your watir autotests
 email:
 - s_seleznev_qa@hotmail.com
 executables: []