marta 0.29156 → 0.30366

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd0d99204224a1b096fe1d9a103ed94c141f33e6
-  data.tar.gz: 92effa54d30743c5718bbcd2fd047143b970e05f
+  metadata.gz: be4abef064cc25eb50c8a5eb9a56882df5f06f29
+  data.tar.gz: 91f8843e49995ddc89d1067074ae253f10aafc66
 SHA512:
-  metadata.gz: 934ff2dcfa6abf910a4f74be6c95826a36cd5c16b1fb06eb35491c8c02a781672b1bf3804099e04d6d8647bc89bf580f7a53b7d60cf9f7c585bbb71f2d3a46dc
-  data.tar.gz: 4debddeef970b3634ccbd73ddcf29ec0e2d1ea2386f4ed19c7d4ef344c862b0c425510c287bba5b746691373eef345b6375c4f9a75a6fbfe0f34f57f8d27b429
+  metadata.gz: ba23f875bbab44dc04ed47d03342499ccf1c7ba7acded1b242a8313aea4ab67e84bfd3cd816e16c91b867d4eab10ecd76cbe1c719d21c24ddad11cd2d9e4c1e4
+  data.tar.gz: fd42bd950f95de0bea1ee2b36070a784633ff262ef775975a785935a28a77b3b8a2fd887394d4e8c5b7198a09cbfbf190f10d51afec8533df6cb027b066e82fb

data/README.md

@@ -40,7 +40,7 @@ your_page.your_element.click
 5. Add *url* variable with the url of desired page as a default value.
 6. Confirm.
 7. Then page will be opened and you will be asked about your_element.
-8. Just click the element and confirm the selection (twice)
+8. Just click the element and confirm the selection.
 9. Now you can run the test without LEARN parameter and it will work.
 
 **So you are `writing code in pageobject pattern` style.**
@@ -95,6 +95,37 @@ dance_with learn: true or false
 your_page.method_edit('newelementname')
 ```
 
+**Q: How is working the open_page method?**
+
+*A: That method is a part of the SmartPage class. It means that you can call it for any class\page object which was generated by Marta. There are three ways to use it:*
+
+*The most straight way*
+```ruby
+dance_with
+TestPage.new.open_page("smthing.com") # Will navigate you to http://smthing.com
+```
+
+*Predefined url way:*
+
+*At the step of the page defining set variable url = smthing.com*
+```ruby
+dance_with
+test_page = TestPage.new
+test_page.url #=> "smthing.com"
+test_page.open_page # Will navigate you to http://smthing.com
+```
+
+*The most flexible way:*
+
+*At the step of the page defining you set path = testpath*
+```ruby
+dance_with base_url: "smthing.com"
+test_page = TestPage.new
+test_page.path #=> "testpath"
+test_page.open_page # Will navigate you to http://smthing.com/testpath
+```
+*Note: If there is no path provided than Marta will go to base_url. Also if url value is defined for page Marta will use it instead the base_url. If url is given as argument for the open_page method Marta will ignore both url and base_url values and will use the argument provided.*
+
 **Q: And what if I want to create page and define element without learn mode? For example in the middle of a debug session.**
 
 *A Code in learn mode =*
@@ -131,13 +162,16 @@ engine.element(id: 'will_be_located_without_Marta')
 
 *A: When defining an element you can set a collection checkbox at the top of the dialog. In that case Marta will return Watir::ElementCollection.*
 
+**Q: How can I find an invisible element? Or hardly clickable element with 1px size?**
+
+*A: At the stage of element defining you can see a button "Find by HTML". That button will open html code of your page in a special blue form. Find the html code of your element and click on it.*
+
 **Q: How can I find not just an element but a Watir::Radio for example?**
 
 *A: Marta automatically performs to_subtype for every element. So if your element is a radio button you will be able to use specific methods.*
 ```ruby
 your_page.element_that_supposed_to_be_radio.set?
 ```
-*ATTENTION. Until [Watir issue 537](https://github.com/watir/watir/issues/537) is not fixed it may work wrong. Sometimes.*
 
 **Q: And what about elements under iframes?**
 
@@ -173,11 +207,11 @@ your_page.important_element.click
 
 **Q: And what about Cucumber? Will it work with Marta?**
 
-*A: I don't know. I am not a Cucumber fan and I have giant doubts that Marta and Cucumber will work together well. But you can try. Also I am thinking about it.*
+*A: Yes it is working with Cucumber and Spinach. I will add some examples later.*
 
-**Q: Ok. With what WILL it work?**
+**Q: Where is an example?**
 
-*A: It should work with rspec and parallel_rspec. See example_project for example*
+*A: See "example_project" for rspec based example*
 
 **Q: How can I design more object oriented and DRY tests using Marta**
 
@@ -206,7 +240,7 @@ g_page.search "I am in love with selenium."
 
 **Q: What else?**
 
-*A: Nothing. Marta is under development. Her version is 0.29156 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.30366 only. And I am not a professional developer. But I am training her on new tricks.*
 
 ## Internal Design
 
@@ -299,7 +333,7 @@ end
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bundle install` to install dependencies. Then run `rake install` to install the current version of gem. Then, run `rake spec` to run the tests.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/lib/marta/classes_creation.rb

@@ -16,6 +16,7 @@ module Marta
     def page_edit(const, data=Hash.new)
       data['vars'] = inject('page', const, data['vars'])
       json_2_class(file_write(const.to_s, data))
+      data['vars']
     end
   end
 end

data/lib/marta/data/style.css

@@ -222,15 +222,16 @@ div[martastyle=html_content] div {
   padding: 5px;
   border-style: solid;
   border-width: 1px;
-  width: 90%
+  width: 90%;
 }
 
 div[martastyle=html_content] div span {
   display: block;
   position: relative;
-  left: 30px;
+  margin-left: 30px;
   text-align: left;
   cursor: pointer;
+  word-wrap:break-word;
 }
 
 div[martaclass=marta_div] b {

data/lib/marta/dialogs.rb

@@ -69,7 +69,7 @@ module Marta
           xpath_meth_merge
         end
       end
-      
+
       # Asking: "What are you looking for?"
       def ask_for_elements
         ask 'element', "Found #{@found} elements for #{@title}", @attrs

data/lib/marta/json_2_class.rb

@@ -86,8 +86,8 @@ module Marta
     end
 
     def build_content(data)
-      build_methods(data['meths'])
-      build_vars(data['vars'])
+      build_methods(data['meths']) if !data['meths'].nil?
+      build_vars(data['vars']) if !data['vars'].nil?
     end
 
     def build_methods(methods)
@@ -116,6 +116,8 @@ module Marta
       if !self.methods.include?(name.to_sym) and (@data['meths'][name].nil?)
         self.singleton_class.send(:attr_accessor, name.to_sym)
         instance_variable_set("@#{name}", process_string(content))
+      elsif self.methods.include?(name.to_sym) and (@data['meths'][name].nil?)
+        instance_variable_set("@#{name}", process_string(content))
       else
         if !@data['meths'][name].nil?
           warn "Marta will not create '#{name}' variable for #{self.class}"\

data/lib/marta/options_and_paths.rb

@@ -17,6 +17,7 @@ module Marta
       @@tolerancy = Hash.new
       @@learn = Hash.new
       @@engine = Hash.new
+      @@base_url = Hash.new
 
       # Getting uniq id for process thread
       def self.thread_id
@@ -52,6 +53,11 @@ module Marta
         @@engine[thread_id]
       end
 
+      # Marta knows what web application she is trying to test
+      def self.base_url
+        @@base_url[thread_id]
+      end
+
       # Marta is changing parameters by the same scheme.
       def self.parameter_set(what, value, default)
         what[thread_id] = !value.nil? ? value : what[thread_id]
@@ -101,6 +107,16 @@ module Marta
       def self.set_tolerancy(value)
         @@tolerancy = parameter_set(@@tolerancy, value, 1024)
       end
+
+      # Marta uses a simple ruke to set the basic url.
+      def self.set_base_url(value)
+        if (value.nil?) or (value.class == String)
+          @@base_url = parameter_set(@@base_url, value, "")
+        else
+          raise ArgumentError, "Basic url at least should be a string. Not"\
+          " a #{value}:#{value.class}"
+        end
+      end
     end
 
     private
@@ -127,14 +143,9 @@ module Marta
       SettingMaster.tolerancy_value
     end
 
-    # Marta is accepting parameters and rereading pageobjects on any change
-    def dance_with(browser: nil, folder: nil, learn: nil, tolerancy: nil)
-      SettingMaster.set_engine browser
-      SettingMaster.set_folder folder
-      SettingMaster.set_learn learn
-      read_folder
-      SettingMaster.set_tolerancy tolerancy
-      engine
+    # Marta knows the basic url of the projec. If it is defined
+    def base_url
+      SettingMaster.base_url
     end
   end
 end

data/lib/marta/public_methods.rb

@@ -29,9 +29,11 @@ module Marta
       @data ||= my_data
       @class_name ||= my_class_name
       @edit_mark ||= will_edit
+      data_vars = Hash.new
       build_content my_data
       if will_edit
-        page_edit my_class_name, my_data
+        data_vars = page_edit my_class_name, my_data
+        my_data["vars"] = data_vars if data_vars != Hash.new
       end
       # We need optimization here very much!
       build_content my_data
@@ -58,13 +60,16 @@ module Marta
 
     # If page has url variable it can be opened like Page.new.open_page
     def open_page(url = nil)
-      if url != nil
+      @path ||= ""
+      if !url.nil?
         engine.goto url
-      else
-        if @url == nil
-          raise ArgumentError, "You should set url to use open_page"
-        end
+      elsif !@url.nil?
         engine.goto @url
+      elsif base_url != ""
+        engine.goto base_url + "/" + (@path.nil? ? "" : @path)
+      else
+        raise ArgumentError, "You should set url to use open_page. You may"\
+        " also use base_url option for dance_with and path for page object"
       end
     end
 

data/lib/marta/simple_element_finder.rb

@@ -56,12 +56,7 @@ module Marta
 
       # Transforming an element to a subtype
       def subtype_of(element)
-        element = @engine.element(xpath: @xpath).to_subtype
-        #https://github.com/watir/watir/issues/537
-        if element.class == Watir::IFrame
-          element = @engine.iframe(xpath: @xpath)
-        end
-        element
+        @engine.element(xpath: @xpath).to_subtype
       end
 
       # Main logic. We are returning a prefinded collection

data/lib/marta/version.rb

@@ -1,4 +1,4 @@
 module Marta
-  VERSION = "0.29156"
+  VERSION = "0.30366"
   NAME = "marta"
 end

data/lib/marta.rb

@@ -54,11 +54,13 @@ module Marta
   # dance_with is for creating settings to be used later.
   # Settings can be changed at any time by calling dance with.
   # Read more in the README
-  def dance_with(browser: nil, folder: nil, learn: nil, tolerancy: nil)
+  def dance_with(browser: nil, folder: nil, learn: nil, tolerancy: nil,
+                 base_url: nil)
     SettingMaster.set_engine browser
     SettingMaster.set_folder folder
+    SettingMaster.set_base_url base_url
     SettingMaster.set_learn learn
-    SmartPageCreator.create_all
+    read_folder
     SettingMaster.set_tolerancy tolerancy
     engine
   end

data/marta.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marta
 version: !ruby/object:Gem::Version
-  version: '0.29156'
+  version: '0.30366'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-19 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: watir
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.7.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement