Merge branch 'master' into feature/document_conversion

Author: askonev

.github/workflows/check.yml

@@ -12,25 +12,39 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.3'
+          ruby-version: '3.4'
       - name: Install gem dependencies
         run: |
           gem install bundler
           bundle config set with 'development'
           bundle install --jobs 4 --retry 3
       - name: Run RuboCop check
-        run: rubocop
+        run: bundle exec rubocop
       - name: Check that code 100% documented
         run: yardoc . | grep -q '100.00% documented'
 
-  run_all_specs_in_default_docker:
+  run_modified_files_in_default_docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout HEAD
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Fetch the full history to access other branches
+      - name: Fetch master branch
+        run: git fetch origin master  # Fetch the master branch
+      - name: Running test inside doc-builder-testing
+        run: |
+          docker build -t doc-builder-testing .
+          docker run -t doc-builder-testing in_modified_specs
+
+  run_critical_in_default_docker:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Running test inside doc-builder-testing
         run: |
           docker build -t doc-builder-testing .
-          docker run -t doc-builder-testing
+          docker run -t doc-builder-testing rspec_critical
 
   run_critical_in_all_dockerfiles:
     runs-on: ubuntu-latest
@@ -46,4 +60,4 @@ jobs:
       - name: Dockerfile ${{ matrix.dockerfiles }}
         run: |
           docker build -t doc-builder-testing -f ${{ matrix.dockerfiles }} .
-          docker run doc-builder-testing
+          docker run doc-builder-testing rspec_critical

.rubocop.yml

@@ -7,7 +7,7 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.4
 
 # Disable this check since we test end-user product
 # And do not perform unit-testing of some ruby classes

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-07-10 07:39:04 UTC using RuboCop version 1.64.1.
+# on 2025-02-27 10:06:14 UTC using RuboCop version 1.72.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,14 +11,14 @@
 Metrics/MethodLength:
   Max: 24
 
-# Offense count: 131
+# Offense count: 151
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 21
+  Max: 22
 
-# Offense count: 411
+# Offense count: 439
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 179

CHANGELOG.md

@@ -12,6 +12,7 @@
 * Ability to set Web Builder url via `WEB_BUILDER_URL`
 * Add `yamllint` check in CI
 * Add `dependabot` check for `GitHub Actions`
+* Use `ruby-3.4` as project base
 
 ### Changes
 
@@ -35,3 +36,4 @@
 ### Fixes
 
 * Fix centos 8 dockerfile
+* Run `rubocop` in CI through `bundle exec`

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.3
+FROM ruby:3.4
 
 MAINTAINER Pavel.Lobashov "shockwavenn@gmail.com"
 

Gemfile

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
+
+ruby '>= 3.4.0'
+
+gem 'csv', '~> 3'
 gem 'jwt'
+gem 'logger', '~> 1'
 gem 'onlyoffice_pdf_parser'
 gem 'ooxml_parser'
 gem 'parallel_tests'

Gemfile.lock

@@ -3,22 +3,24 @@ GEM
   specs:
     Ascii85 (2.0.1)
     afm (0.2.2)
-    ast (2.4.2)
+    ast (2.4.3)
     base64 (0.2.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     childprocess (5.1.0)
       logger (~> 1.5)
-    diff-lcs (1.5.1)
+    csv (3.3.3)
+    diff-lcs (1.6.1)
     hashery (2.1.2)
     image_size (3.4.0)
     iniparse (1.5.0)
-    json (2.7.6)
-    jwt (2.9.3)
+    json (2.10.2)
+    jwt (2.10.1)
       base64
-    language_server-protocol (3.17.0.3)
-    logger (1.6.1)
-    mini_portile2 (2.8.7)
-    nokogiri (1.16.7)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    mini_portile2 (2.8.8)
+    nokogiri (1.18.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     observer (0.1.2)
@@ -29,82 +31,92 @@ GEM
     ooxml_decrypt (1.0.0)
       nokogiri (~> 1.10)
       ruby-ole (~> 1.2)
-    ooxml_parser (0.37.1)
+    ooxml_parser (0.38.0)
       nokogiri (~> 1)
       ooxml_decrypt (~> 1)
       rubyzip (~> 2)
-    overcommit (0.64.1)
+    overcommit (0.67.1)
       childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
       rexml (>= 3.3.9)
     parallel (1.26.3)
-    parallel_tests (4.7.2)
+    parallel_tests (5.1.0)
       parallel
-    parser (3.3.6.0)
+    parser (3.3.7.4)
       ast (~> 2.4.1)
       racc
-    pdf-reader (2.13.0)
+    pdf-reader (2.14.1)
       Ascii85 (>= 1.0, < 3.0, != 2.0.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pkg-config (1.5.7)
+    pkg-config (1.6.0)
+    prism (1.4.0)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
-    regexp_parser (2.9.2)
-    rexml (3.3.9)
-    rmagick (6.0.1)
+    regexp_parser (2.10.0)
+    rexml (3.4.1)
+    rmagick (6.1.1)
       observer (~> 0.1)
       pkg-config (~> 1.4)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.68.0)
+    rspec-support (3.13.2)
+    rubocop (1.75.2)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.34.0)
-      parser (>= 3.3.1.0)
-    rubocop-performance (1.22.1)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (3.2.0)
-      rubocop (~> 1.61)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.44.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.5.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-ole (1.2.13.1)
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     semantic (1.6.1)
     ttfunk (1.8.0)
       bigdecimal (~> 3.1)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     yard (0.9.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  csv (~> 3)
   jwt
+  logger (~> 1)
   onlyoffice_pdf_parser
   ooxml_parser
   overcommit
@@ -118,5 +130,8 @@ DEPENDENCIES
   semantic
   yard
 
+RUBY VERSION
+   ruby 3.4.1p0
+
 BUNDLED WITH
-   2.3.24
+   2.6.2

README.md

@@ -1,5 +1,7 @@
 # docbuilder-testing
 
+[![check](https://github.com/ONLYOFFICE-QA/doc-builder-testing/actions/workflows/check.yml/badge.svg)](https://github.com/ONLYOFFICE-QA/doc-builder-testing/actions/workflows/check.yml)
+
 Framework for QA of `onlyoffice-documentbuilder`
 
 ## Configuration
@@ -14,6 +16,16 @@ Framework for QA of `onlyoffice-documentbuilder`
 |              | docx          | docxf | docm | dotm | dotx | epub | fb2 | html | odt | ott | pdf | pdfa | rtf | txt |
 | docx         | *             | *     | *    | *    | *    | *    | *   | *    | *   | *   | *   | *    | *   | *   |
 
+## Windows
+
+* Install native docbuilder to `C:\`
+
+```shell
+  bundle install
+  rake run_test_on_win
+```
+
+
 ## Project Information
 
 [Official website](https://www.onlyoffice.com)
@@ -26,19 +38,3 @@ Framework for QA of `onlyoffice-documentbuilder`
 
 docbuilder-testing is released under an GNU AGPL v3.0 license.
 See the LICENSE file for more information.
-
-## install via windows
-
-* Install desktop builder to `C:\`
-
-* Install dependencies
-
-```shell
-  bundle install
-```
-
-* Run test
-
-```shell
-  rake run_test_on_win
-```

Rakefile

@@ -13,6 +13,13 @@ end
 desc 'run parallel_rspec on builder in documentserver'
 task :web do
   ENV['BUILDER_PLATFORM'] = 'WEB'
+  doclinux = WebDocBuilderWrapper.new(documentserver_path: 'https://doc-linux.teamlab.info')
+  kim = WebDocBuilderWrapper.new(documentserver_path: 'https://kim.teamlab.info')
+
+  server = doclinux.semver > kim.semver ? doclinux : kim
+  ENV['WEB_BUILDER_URL'] = server.uri
+  puts "Run on #{server.uri}, version #{server.version_with_build}"
+
   sh 'bundle exec parallel_rspec --exclude-pattern "spec/python_wrapper/**" spec'
 end
 
@@ -30,3 +37,30 @@ desc 'run project spec'
 task :project_spec do
   system('bundle exec parallel_rspec project_spec')
 end
+
+desc 'run tests in modified specs'
+task :in_modified_specs do
+  run_default = false
+
+  # get changes in framework
+  lib_diff = `git diff --name-only origin/master -- lib dockerfiles Dockerfile Gemfile Gemfile.lock 2>&1`
+  # check of comparison results/errors
+  run_default = true if !lib_diff.empty? || lib_diff.include?('fatal:')
+
+  # get changes in scripts and find them in spec
+  scripts_diff = `git diff --name-only origin/master -- js python | xargs -I {} grep -Rl {} spec`
+  # get changes in spec
+  spec_diff = `git diff --name-only origin/master -- spec ':!spec/spec_helper.rb' ':!spec/test_data.rb'`
+  files = spec_diff.split | scripts_diff.split
+
+  unless run_default
+    if files.all? { |element| element =~ %r{^spec/.*\.rb} }
+      files.empty? ? print('NO TESTS TO RUN.') : sh("bundle exec parallel_rspec #{files.join(' ')}")
+    else
+      print("An incorrect file type for rspec has been detected: #{files}")
+      run_default = true
+    end
+  end
+
+  Rake::Task['default'].invoke if run_default
+end