onlyoffice_documentserver_testing_framework 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '022178399bd1d1d76f54e1ac969c4fc0772261bccf8164e3da2ea29e422fd78a'
-  data.tar.gz: 665670021caaa01e5f4da3b7c4640d2c587bd3ec998cd577d84f65cbdd5c8d9f
+  metadata.gz: 6f573f10ee5036a1d265e3c051459152c43200cc0bc643ad9aae0c7162db64cf
+  data.tar.gz: cc40c35e2ee03a1c426b705085f953b10e134f11ed587a0ce816b1de2197d893
 SHA512:
-  metadata.gz: 7ce4615d5561e6234d3e850b81b9733086f840929f6e5d42d000581a2aa001bfaf4ac4d38489085612991302329736b64540e087b04c1e2c662915ea36d0e6d8
-  data.tar.gz: 9c951e1ce667286a8362f4133ffd60da06255766a2a6b9d724ef497a84ab2f5218a0076b06ac183165f9c5ce2fa2b19bdee090180fa229d24b975594bf78e968
+  metadata.gz: 528d56b800931558849f0144d4bb76107ce9e147b0cd86627d3ad2298f8c3a5b48fdf32542945ef7041ae61029c492db0664e3539e77cf08c225e9d32bb72570
+  data.tar.gz: e3c003b6d70aa8fe17f8c7b18360a75771a9a661d0e12afb4b0bbd48929dcea2e9d4c851438a164938efea10f2a0283bc2fa8d6d922f0844936bac8f3a803a70

data/lib/onlyoffice_documentserver_testing_framework/test_instance_docs/doc_test_site_functions.rb

@@ -209,7 +209,7 @@ class DocTestSiteFunctions
 
   # @return [Nothing]
   def go_to_healthcheck
-    @instance.webdriver.open("#{@instance.user_data.portal}/healthcheck")
+    @instance.webdriver.open("#{@instance.user_data.portal}healthcheck")
   end
 
   # @return [HealthcheckPage] page of healthcheck
@@ -235,8 +235,8 @@ class DocTestSiteFunctions
              'doc_test_site_languages_before_6_2.list'
            end
     File.readlines("#{File.expand_path('..', __dir__)}"\
-                                     '/test_instance_docs/doc_test_site_functions/'\
-                                     "#{file}")
+                   '/test_instance_docs/doc_test_site_functions/'\
+                   "#{file}")
         .map(&:strip)
   end
 end

data/lib/onlyoffice_documentserver_testing_framework/test_instance_docs/management.rb

@@ -17,9 +17,11 @@ module OnlyofficeDocumentserverTestingFramework
       @xpath_iframe_count = 1
       # Don't mixup iframe with help
       @xpath_iframe = '//iframe[not(contains(@src, "/help/")) and '\
-                               'not(contains(@id, "fileFrame"))]'
+                      'not(contains(@id, "fileFrame"))]'
       @alert_dialog_xpath = '//div[@role="alertdialog"]'
       @alert_dialog_span_xpath = "#{@alert_dialog_xpath}/div/div/div/span"
+      @xpath_window_modal = "//div[contains(@class, 'asc-window modal')]"
+      @xpath_anonymous_user_name_input = '//div[@id="id-dlg-username-caption"]'
     end
 
     # @return [Boolean] check if loader present
@@ -38,7 +40,7 @@ module OnlyofficeDocumentserverTestingFramework
       loader5 = @instance.selenium.element_visible?('//*[@id="loading-mask"]')
       loader6 = @instance.selenium.element_visible?('//*[@class="modals-mask"]')
       loader7 = @instance.selenium.element_visible?('//*[@class="asc-loadmask"]')
-      loader8 = @instance.selenium.element_visible?(@xpath_window_modal)
+      loader8 = loading_blocking_modal_dialog?
       mobile_loader = wait_for_mobile_loading if main_frame_mobile_element_visible?
       @instance.selenium.select_top_frame
       loading = loader1 || loader2 || loader3 ||
@@ -57,6 +59,7 @@ module OnlyofficeDocumentserverTestingFramework
     def wait_for_mobile_loading
       @instance.selenium.element_visible?('//*[contains(@class,"modal-preloader")]') ||
         @instance.selenium.element_visible?('//*[contains(@class,"loader-page")]') ||
+        @instance.selenium.element_visible?('//div[contains(@class, "dialog-preloader")]') ||
         @instance.selenium.get_element('//*[contains(@class,"iScrollVerticalScrollbar")]').nil?
     end
 
@@ -77,6 +80,8 @@ module OnlyofficeDocumentserverTestingFramework
 
     # Wait for operation with round status in canvas editor
     # @param [Integer] timeout_in_seconds count of seconds to wait
+    # @param [Hash] options additional options
+    # @option options [Integer] :additional_wait additional after file open. 0 by default
     def wait_for_operation_with_round_status_canvas(timeout_in_seconds = 300, options = {})
       result = true
       OnlyofficeLoggerHelper.log('Start waiting for Round Status')
@@ -88,8 +93,8 @@ module OnlyofficeDocumentserverTestingFramework
         sleep(1)
         current_wait_time += 1
         OnlyofficeLoggerHelper.log('Waiting for Round Status for '\
-                                    "#{current_wait_time} of "\
-                                    "#{timeout_in_seconds} timeout")
+                                   "#{current_wait_time} of "\
+                                   "#{timeout_in_seconds} timeout")
         @instance.doc_editor.windows.txt_options.txt_options = 'Unicode (UTF-8)'
         @instance.spreadsheet_editor.windows.csv_option.csv_options = options
 
@@ -130,6 +135,7 @@ module OnlyofficeDocumentserverTestingFramework
       @instance.selenium.execute_javascript('window.onbeforeunload = null') # OFF POPUP WINDOW
       @instance.selenium.select_top_frame
       add_error_handler
+      sleep(options.fetch(:additional_wait, 0))
       result
     end
 
@@ -202,5 +208,13 @@ module OnlyofficeDocumentserverTestingFramework
         @instance.selenium.webdriver_error "Unknown editor type for url: #{url}"
       end
     end
+
+    # @return [True, False] is there is loading blocking modals dialog
+    def loading_blocking_modal_dialog?
+      return false unless @instance.selenium.element_visible?(@xpath_window_modal)
+      return false if @instance.selenium.element_visible?(@xpath_anonymous_user_name_input)
+
+      true
+    end
   end
 end

data/lib/onlyoffice_documentserver_testing_framework/version.rb

@@ -4,6 +4,6 @@ module OnlyofficeDocumentserverTestingFramework
   # Module to hold version of Gem
   module Version
     # [String] version of gem
-    STRING = '0.5.0'
+    STRING = '0.6.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_documentserver_testing_framework
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: onlyoffice_logger_helper
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: ONLYOFFICE DocumentServer testing framework