onlyoffice_documentserver_testing_framework 2.4.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f74cb36c08ce0c13f7805732784fd67768f2ebf74d2c44e126433b5e2e7541f
-  data.tar.gz: 7d824945bf257daf01fa9d002fc6653bb44d066e26ca1b6984b97ad059d03ca9
+  metadata.gz: 6967c2a133ff6880c81d2ecead2504ad6fcc569282fc44b7321a9b5aa10a4680
+  data.tar.gz: 821bc1465b598a0537bcc9a2904064eedc5941c78f25f348993661707cadcf59
 SHA512:
-  metadata.gz: 67efa48bf9e7f71c80f152c4f27cc02db052d72cc5357bafb4ed103c56aa0e86e3221b3adc7edbf4f0941ffa1d3c5f539babc620120ab970340621444a4b9898
-  data.tar.gz: 80fb3f4f04d40ad40dec2161ea92ebd59d7c67cc447056ccf11223d9b11b67f82cfda5582a1624906531a3907bc3f9c21e351856da2bc839a56b73835dedd901
+  metadata.gz: 0e1d61ea7d92e8277c41c796b93ef367a917ae7b1d815e99cd286f99d1c20d01255d0da237f668aceb2ca513550fbd17717235b212a6c904bac1c2d0ef392277
+  data.tar.gz: eb394dea96fc4b12c51f00c24551b6f6dd152e8365a652b8816827a74bcdf6252ac5339f2acb5025ab435eca6a396ce6df924c9b2e6bb317bd0ad0aced5399e5

data/lib/onlyoffice_documentserver_testing_framework/test_instance_docs/doc_test_site_functions/doc_test_file_list/doc_test_site_file_list_entry.rb

@@ -18,9 +18,10 @@ class DocTestSiteFileListEntry
   # @return [String] View mode url
   attr_accessor :view_mode_url
 
-  def initialize(instance, xpath)
+  def initialize(instance, xpath, edit_modes_indexes)
     @instance = instance
     @xpath_line = xpath
+    @edit_modes_indexes = edit_modes_indexes
     @file_name = fetch_file_name
     @embedded_url = fetch_embedded_url
     @review_mode_url = fetch_review_mode_url
@@ -44,7 +45,7 @@ class DocTestSiteFileListEntry
 
   # @return [String] url on review mode
   def fetch_review_mode_url
-    xpath_review = "#{@xpath_line}/td[#{mode_indexes[:review_mode]}]/a"
+    xpath_review = "#{@xpath_line}/td[#{@edit_modes_indexes[:review_mode]}]/a"
     return nil unless @instance.selenium.element_present?(xpath_review)
 
     url = @instance.selenium.get_attribute(xpath_review, 'href')
@@ -54,7 +55,7 @@ class DocTestSiteFileListEntry
 
   # @return [String] url on review mode
   def fetch_comment_mode_url
-    xpath_comment = "#{@xpath_line}/td[#{mode_indexes[:comment_mode]}]/a"
+    xpath_comment = "#{@xpath_line}/td[#{@edit_modes_indexes[:comment_mode]}]/a"
     return nil unless @instance.selenium.element_present?(xpath_comment)
 
     url = @instance.selenium.get_attribute(xpath_comment, 'href')
@@ -64,7 +65,7 @@ class DocTestSiteFileListEntry
 
   # @return [String] url on fill forms mode
   def fetch_fill_forms_mode_url
-    xpath_comment = "#{@xpath_line}/td[#{mode_indexes[:fill_forms]}]/a"
+    xpath_comment = "#{@xpath_line}/td[#{@edit_modes_indexes[:fill_forms]}]/a"
     return nil unless @instance.selenium.element_present?(xpath_comment)
 
     url = @instance.selenium.get_attribute(xpath_comment, 'href')
@@ -74,7 +75,7 @@ class DocTestSiteFileListEntry
 
   # @return [String] url on fill forms mode
   def fetch_only_fill_forms_mode_url
-    link_xpath = "#{@xpath_line}/td[#{mode_indexes[:only_fill_forms]}]/a"
+    link_xpath = "#{@xpath_line}/td[#{@edit_modes_indexes[:only_fill_forms]}]/a"
     return nil unless @instance.selenium.element_present?(link_xpath)
 
     url = @instance.selenium.get_attribute(link_xpath, 'href')
@@ -84,7 +85,7 @@ class DocTestSiteFileListEntry
 
   # @return [String] url on viewer mode
   def fetch_view_mode_url
-    xpath_comments = "#{@xpath_line}/td[#{mode_indexes[:view_mode]}]/a"
+    xpath_comments = "#{@xpath_line}/td[#{@edit_modes_indexes[:view_mode]}]/a"
     return nil unless @instance.selenium.element_present?(xpath_comments)
 
     url = @instance.selenium.get_attribute(xpath_comments, 'href')
@@ -94,22 +95,11 @@ class DocTestSiteFileListEntry
 
   # @return [String] url on embedded file
   def fetch_embedded_url
-    url = @instance.selenium.get_attribute("#{@xpath_line}/td[#{mode_indexes[:embedded]}]/a", 'href')
+    xpath_embedded = "#{@xpath_line}/td[#{@edit_modes_indexes[:embedded]}]/a"
+    return nil unless @instance.selenium.element_present?(xpath_embedded)
+
+    url = @instance.selenium.get_attribute(xpath_embedded, 'href')
     OnlyofficeLoggerHelper.log("Got embedded #{@xpath_line} url: #{url}")
     url
   end
-
-  private
-
-  # Indexes of different modes
-  # @return [Hash] name with index
-  def mode_indexes
-    {
-      comment_mode: 4,
-      review_mode: 5,
-      fill_forms: 7,
-      view_mode: 8,
-      embedded: 10
-    }
-  end
 end

data/lib/onlyoffice_documentserver_testing_framework/test_instance_docs/doc_test_site_functions/file_reopen_helper.rb

@@ -22,7 +22,7 @@ module OnlyofficeDocumentserverTestingFramework
       file_name = @instance.management.document_name
       size_before = @instance.integration_example_api.file_data(file_name)['pureContentLength'].to_i
       @instance.go_to_base_url
-      @instance.webdriver.wait_until(timeout, "File #{file_name} is not built in #{timeout}") do
+      @instance.webdriver.wait_until(timeout, "File `#{file_name}` is built") do
         file_data = @instance.integration_example_api.file_data(file_name)
         !file_data.nil? && file_data['pureContentLength'].to_i != size_before
       end

data/lib/onlyoffice_documentserver_testing_framework/test_instance_docs/doc_test_site_functions.rb

@@ -13,7 +13,7 @@ class DocTestSiteFunctions
   select_list(:user_list, xpath: '//*[@id="user"]')
   select_list(:language_list, xpath: '//*[@id="language"]')
 
-  def initialize(instance)
+  def initialize(instance, edit_modes_indexes = default_modes_indexes)
     super(instance.webdriver.driver)
     @instance = instance
     @xpath_begin_view = '//*[@id="beginView"]'
@@ -27,6 +27,7 @@ class DocTestSiteFunctions
                              '//*[contains(@class, "try-editor cell")]'
     @xpath_create_presentation = '//*[contains(@class, "try-editor presentation")]|'\
                                  '//*[contains(@class, "try-editor slide")]'
+    @edit_modes_indexes = edit_modes_indexes
   end
 
   # Waiting for load of page
@@ -168,7 +169,9 @@ class DocTestSiteFunctions
   def uploaded_file_list
     file_list = []
     (0...uploaded_file_count).each do |current_file_number|
-      file_list << DocTestSiteFileListEntry.new(@instance, "#{@xpath_file_entry}[#{current_file_number + 1}]")
+      file_list << DocTestSiteFileListEntry.new(@instance,
+                                                "#{@xpath_file_entry}[#{current_file_number + 1}]",
+                                                @edit_modes_indexes)
     end
     DocTestFileList.new(file_list)
   end
@@ -232,4 +235,18 @@ class DocTestSiteFunctions
                    "#{file}")
         .map(&:strip)
   end
+
+  private
+
+  # Indexes of different modes
+  # @return [Hash] name with index
+  def default_modes_indexes
+    {
+      comment_mode: 4,
+      review_mode: 5,
+      fill_forms: 7,
+      view_mode: 8,
+      embedded: 10
+    }
+  end
 end

data/lib/onlyoffice_documentserver_testing_framework/test_instance_docs/integration_example_api.rb

@@ -36,15 +36,20 @@ module OnlyofficeDocumentserverTestingFramework
     end
 
     # Delete file on server by name
-    # @param [String] file_name
+    # @param [String] file_name name of file to delete
+    # @param [Integer] sleep_after_delete how much time to sleep after file delete
+    #   sometimes it took time to delete this file and it cannot be checked by `file_data`
+    #   method, since file will be not created but you get inside old file
     # @return [nil]
-    def delete_file(file_name)
+    def delete_file(file_name, sleep_after_delete: 3)
       raise 'File name is not found on server' unless file_data(file_name)
 
       url = URI::DEFAULT_PARSER.escape("#{@api_endpoint}/file?filename=#{file_name}")
       request = Net::HTTP::Delete.new(url)
       response = http_from_url(url).request(request)
-      JSON.parse(response.read_body)
+      result = JSON.parse(response.read_body)
+      sleep(sleep_after_delete)
+      result
     end
 
     # Get file data by it's name

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 = '2.4.0'
+    STRING = '2.6.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_documentserver_testing_framework
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.6.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-25 00:00:00.000000000 Z
+date: 2022-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: onlyoffice_logger_helper