marta 0.36788 → 0.37396

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb9cae36f41b19234de4624d84b15b121e18e2ab
-  data.tar.gz: 58e97be1e74776026c8fee29675be311ca296b3d
+  metadata.gz: 12ec2a504a8d87171ea120513b7ec80d6db61961
+  data.tar.gz: c24afb174f328be3221a39274a1cc9ad22a925b7
 SHA512:
-  metadata.gz: cc0b3343e92ca8298626fbb314c59c6c2acb35504b530fcbfcfcf2af895dba08ee3ad55320b3c221f0f208d9e921460b61e1968f63ab11242673d95d05129768
-  data.tar.gz: 37ca26dde66f8db7652fd7adbde7838abd68403ff3e1eb5a6fd4341f48c1b630780e447101980e6dab82d879b62b54f1ff1ce8048005e6dd63fe9c2793a2f931
+  metadata.gz: 3d85be37f4bc4ee4911e51f8e26860951975dbbf28ae9dbc063f35a012523056b5a97fe017de0a48b66faac2049cdab43e95a176f0ffca224b5977fa06e9ceaf
+  data.tar.gz: 6c5de76ed3e580f77e132d4c4eea9dd6e943a57092a87d46eec4642807e5e454b1e211bfcc516e8176c6ee266ee399545eee60d34f4dfd6726ba30fd15a28477

data/README.md

@@ -301,7 +301,7 @@ g_page.search "I am in love with selenium."
 
 **Q: What else?**
 
-*A: Nothing. Marta is under development. Her version is 0.36788. All the necessary features are working already but there are tons of things that should be done. And I am not a professional developer.*
+*A: Nothing. Marta is under development. Her version is 0.37396. All the necessary features are working already but there are tons of things that should be done. And I am not a professional developer.*
 
 ## Internal Design
 

data/example_project/spec/p_object/pageobjects/MartaTestPage.json

@@ -160,6 +160,23 @@
         "type": "button",
         "value": "First button"
       }
+    },
+    "the_iframe": {
+      "granny": {
+      },
+      "options": {
+        "collection": false,
+        "granny": "HTML",
+        "pappy": "BODY",
+        "self": "IFRAME"
+      },
+      "pappy": {
+      },
+      "self": {
+        "height": "300",
+        "src": "/welcome",
+        "width": "300"
+      }
     }
   }
 }

data/example_project/spec/p_object/pageobjects/TheIframe.json

@@ -0,0 +1,24 @@
+{
+  "vars": {
+    "path": "",
+    "url": ""
+  },
+  "meths": {
+    "github_link": {
+      "granny": {
+      },
+      "options": {
+        "collection": false,
+        "granny": "HTML",
+        "pappy": "BODY",
+        "self": "A"
+      },
+      "pappy": {
+      },
+      "self": {
+        "href": "https://github.com/sseleznevqa/marta",
+        "retrieved_by_marta_text": "GITHUB link"
+      }
+    }
+  }
+}

data/example_project/spec/test_page_spec.rb

@@ -4,6 +4,23 @@ describe "We will do some dummy things like" do
   before(:each) do
     @page = MyTestPage.open_page
   end
+
+  context "Angry iframe test" do
+    before(:each) do
+      @b = engine
+      dance_with browser: @page.the_iframe
+    end
+
+    after(:each) do
+      dance_with browser: @b
+    end
+
+    it "Looking into iframe" do
+      the_iframe = TheIframe.new
+      expect(the_iframe.github_link.text).to eq "GITHUB link"
+    end
+  end
+
   it "touching every single element at the test page" do
     expect(@page.numbers[1].text).to eq "Two"
     @page.form_fill
@@ -11,4 +28,5 @@ describe "We will do some dummy things like" do
     @page.second_button.click
     expect(@page.title_exact.present?).to be true
   end
+
 end

data/lib/marta.rb

@@ -1,4 +1,12 @@
+require "watir"
+require 'fileutils'
+require 'json'
+require 'webrick'
+require 'socket'
+
+
 require "marta/version"
+require "marta/object"
 require 'marta/public_methods'
 require 'marta/options_and_paths'
 require 'marta/read_write'
@@ -13,11 +21,6 @@ require 'marta/simple_element_finder'
 require 'marta/x_path'
 require 'marta/page_arithmetic'
 require 'marta/server'
-require "watir"
-require 'fileutils'
-require 'json'
-require 'webrick'
-require 'socket'
 
 
 #
@@ -44,18 +47,6 @@ module Marta
     end
   end
 
-  # That is how Marta connected to the world
-
-  # We will ask user about completely new class
-  def Object.const_missing(const, *args, &block)
-    if !SettingMaster.learn_status
-      raise NameError, "#{const} is not defined."
-    else
-      data, data['vars'], data['meths'] = Hash.new, Hash.new, Hash.new
-      SmartPageCreator.json_2_class(ReaderWriter.file_write(const.to_s, data))
-    end
-  end
-
   # Marta is returning an engine (it should be a browser instance)
   # Watir::Browser.new(:chrome) by default
   def engine
@@ -69,6 +60,7 @@ module Marta
                  base_url: nil, cold_timeout: nil, port: nil, clear: nil)
     SettingMaster.clear if clear
     SettingMaster.set_port port
+    # We are always turning the server on in order to show Welcome!
     SettingMaster.set_server # server should be before browser
     SettingMaster.set_engine browser # browser should be before learn!
     SettingMaster.set_learn learn

data/lib/marta/data/test.html

@@ -2,6 +2,7 @@
   <title>Example page</title>
   <body>
     <h1 id='Title'>Test page</h1>
+    <iframe src="/welcome" width=300 height=300></iframe>
     <form>
       <input type='text' class='some' placeholder='utka'>
       <select custom='custom'>

data/lib/marta/injector.rb

@@ -125,7 +125,13 @@ module Marta
         while result != true
           # When Marta can't get a result she is reinjecting her stuff
           result = MartaServer.wait_user_dialog_response
-          actual_injection if !result
+          # We need double check for iframes here. It should be 100% changed.
+          if !result
+            result = engine.execute_script("return document.marta_confirm_mark")
+          end
+          if (!result and !engine.element(id: 'marta_s_everything').exists?)
+            actual_injection
+          end
         end
         run_script("return document.marta_result")
       end

data/lib/marta/marta_app/content.js

@@ -39,7 +39,7 @@ function marta_real_send(answer, the_port) {
 async function refreshData()
 { console.log("Marta is checking is she on the page");
 
-    if ((typeof document.getElementById("marta_s_everything") == undefined) || (document.getElementById("marta_s_everything") == null)){
+    if (((typeof document.getElementById("marta_s_everything") == undefined) || (document.getElementById("marta_s_everything") == null)) && (window == top)){
       console.log("Marta is lost. Asking ruby Marta to do something with the port = " + port);
       document.xmlHttp = new XMLHttpRequest();
       var martaUrl = "http://localhost:" + port + "/dialog/not_answer";

data/lib/marta/marta_app/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "Marta app",
-  "version": "0.36788",
+  "version": "0.37396",
   "description": "Messaging from browser to main app",
   "permissions": ["activeTab", "http://127.0.0.1*/*", "storage"],
   "background": {

data/lib/marta/object.rb

@@ -0,0 +1,12 @@
+
+module Marta
+  # Constant missing is hijacked!
+  def Object.const_missing(const)
+    if !SettingMaster.learn_status
+      raise NameError, "uninitialized constant #{const}"
+    else
+      data, data['vars'], data['meths'] = Hash.new, Hash.new, Hash.new
+      SmartPageCreator.json_2_class(ReaderWriter.file_write(const.to_s, data))
+    end
+  end
+end

data/lib/marta/options_and_paths.rb

@@ -147,7 +147,13 @@ module Marta
       # Marta uses simple rules to set the laearn mode
       def self.set_learn(value)
         @@learn = parameter_set(@@learn, value, learn_option)
-        warn "If browser was not started by Marta. Learn will not work properly"
+        if learn_status
+          warn "Be carefull. If browser was not started by Marta."\
+          " Learn mode will not work properly"
+        else
+          # We are switching server off if we do not really need it
+          SettingMaster.server.server_kill
+        end
       end
 
       # Marta uses simple rules to set the tolerancy value
@@ -171,7 +177,7 @@ module Marta
 
       # Marta uses simple rule to set the cold timeout
       def self.set_cold_timeout(value)
-        parameter_check_and_set(@@cold_timeout, value, 10, Fixnum)
+        parameter_check_and_set(@@cold_timeout, value, 10, Integer)
       end
 
       # Marta sets port. If it is not defined and there are number of threads
@@ -183,14 +189,14 @@ module Marta
             i += 1
           end
         end
-        parameter_check_and_set(@@port, value, 6260 + @@port.size + i, Fixnum)
+        parameter_check_and_set(@@port, value, 6260 + @@port.size + i, Integer)
       end
 
       # We are storaging server instance as a setting
       def self.set_server
         if SettingMaster.server.nil?
           @@server[thread_id] = Server::MartaServer.new(SettingMaster.port)
-        elsif SettingMaster.server.current_port != SettingMaster.port
+        elsif !Server::MartaServer.port_check(SettingMaster.port)
           @@server[thread_id] = Server::MartaServer.new(SettingMaster.port)
         end
       end

data/lib/marta/version.rb

@@ -1,4 +1,4 @@
 module Marta
-  VERSION = "0.36788"
+  VERSION = "0.37396"
   NAME = "marta"
 end

data/marta.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "pry"
   spec.add_dependency "watir", '>= 6.7.2'
   spec.add_dependency "json"
   spec.add_dependency "webrick"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marta
 version: !ruby/object:Gem::Version
-  version: '0.36788'
+  version: '0.37396'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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
@@ -127,6 +141,7 @@ files:
 - bin/setup
 - example_project/p_object/test_page.rb
 - example_project/spec/p_object/pageobjects/MartaTestPage.json
+- example_project/spec/p_object/pageobjects/TheIframe.json
 - example_project/spec/spec_helper.rb
 - example_project/spec/test_page_spec.rb
 - example_project/tests_with_learning.sh
@@ -153,8 +168,7 @@ files:
 - lib/marta/marta_app/background.js
 - lib/marta/marta_app/content.js
 - lib/marta/marta_app/manifest.json
-- lib/marta/marta_app/marta_app.crx
-- lib/marta/marta_app/marta_app.pem
+- lib/marta/object.rb
 - lib/marta/options_and_paths.rb
 - lib/marta/page_arithmetic.rb
 - lib/marta/public_methods.rb
@@ -185,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: That will be an another one watir-webdriver wrap

data/lib/marta/marta_app/marta_app.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDxrXsFaSILL75W
-2axSD/fW9nxcvP/jxBgcmbG58oguJ5QVAI45ay0wOBa3z860BDRmYY2ICi8hjIXi
-wmlUG3KY8p13pV9oMkWAbi69Z4s+osELP7XYir4BVxjYeU7KTqhsWIh3Cg3DBpMl
-j98wzgSPxKW/NaUrInaZjYhW2ZYg9wrjNyc6LRm9Tkl6sPPGRFSSn8c9FxBwq8CT
-2e/x4QsicjkUWbKawIPvb3C4zmyc9QsZlWt3T9yd7ra17FGHBy+6Womvw6d3pmdK
-HF+rjY1ldjmQ/E6GMJeE1sfdc2uwh1LYoGM9vJXx8NVKNHWREthHrOa7KkEyrsNw
-AFp8sIgvAgMBAAECggEAK07LHM0aLKcBlM6s8oeqAftpjbTQpiAdsgJYttmfTaYK
-Azl2QxPRpTJn38h9YgTe3vncQuSQTZLA60GrXkcM4huX3DjmP+XCTqFv/sDvUuoX
-bcyc6ZDzO4pACYqzc81koQW8bph+ntQuyixd8oD4kErM6NbUIkaquhmCtQ2IuZ8y
-RsEV9Dn0ZAo5o0X5IZKiXVeRGUymvN9eNcdzLVMomgCBBwFVe7avo4ADivXrQLlY
-CZufCoZO5i/67S4YvbgQqEiBInHLAsAC9JmXzwGcpw/48glahl/YzhZ4lQbGNEHc
-7H13D/ZBna4dvX4Mn/rW+XtiRZIxVAvgo1y8xi3dAQKBgQD/aesE2/1CW+uzNU9q
-ji1438YHEkkPnjdL1cBgopT68aAalp5WI2aqCZOsTztKExtH/SWnzz64pWUI+ZuG
-Z/c6PZjTXlpPYTsa9hOFroa1QQ3p7HhE7yilzUw/QA03XRc1zPTbxVSxADyf9OlQ
-2DWBAT77GLX13bMzBmCKbIWM/QKBgQDyO327XSR+I1ViW7YEhUK3xoOjMzlsvAAS
-n/teueJBbgGpI7Jen4shLKrJDlapXoCiQxIat0vgu+AmeSeCUZ3x/fO69lFVjBB+
-GjaegmbaC7fU1JiwqJeoK7LYlQrt+17/b4qqwKkUo+7m9G0aTUeQuoUINpX5lTfM
-xFzYXsJHmwKBgH8E3av8+2YU8JKe4G/NZS/HmWPK5CqwNC+yjYmBUTW7FDQk03lj
-AZtuR9JZVNLxzY9vhVp+5mJNXoGoIIAnE/wSxf3X3nG7mPk/h1XkBXn+cDz1LJqb
-lUtfXZvW7rupv/ExjFP/Pq8Hvx6NXbqmy3TsebXGBDfRmVy2vywX7BLBAoGAJ1wl
-VQGQgXKKWD4guGFS8vutviH/rbxqopweQ0kfC5Stbmdff2KbP9u7MIpE6KZzbmpJ
-kc/A45aDmJzNH67VZFHofbOyiZ0FvQfTYjQ8NCf9Sfb1jJcIdYoMOIcXTI4w5H6i
-YJaHotP0aNDEvaZa/5hfL3N3MSPe+kXZ9EqJdQsCgYEAqP+PlqfyZhY2Qlhc0bz9
-mbQjL3KfF3dN2Qa/vJSylaXDm9lULtVKeQYoTM71zk0D2LhZQlS5PicDN/dbbuIZ
-mL0bJaZ25uT8Ssus5OK1xxjMHlvzkwNGDjWCw6QJHzO6LzgriFK9CYiRXjXCrZ6b
-cdd8rjqXXTJG/hAtIDzk+Y4=
------END PRIVATE KEY-----