summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2022-04-27 20:11:24 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2022-04-27 20:11:24 +0000
commitd4874f303eca4aa2b13c8f4939d53ffa0265a1fc (patch)
tree2503c5cd48e7c3a55827a2b4686a815f1b7fff5f
parent0de8c6dc17b419976adb5ad2fa74ff83e442172d (diff)
downloadredmine-d4874f303eca4aa2b13c8f4939d53ffa0265a1fc.tar.gz
redmine-d4874f303eca4aa2b13c8f4939d53ffa0265a1fc.zip
Update Nokogiri to 1.12.5 for Ruby < 2.6.0 and 1.13.4 for Ruby >= 2.6.0 (#36912).
git-svn-id: https://svn.redmine.org/redmine/trunk@21539 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index a8687c871..81ac1e506 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' :
gem 'marcel'
gem "mail", "~> 2.7.1"
gem 'csv', '~> 3.2.0'
-gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.2' : '~> 1.13.0')
+gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '~> 1.13.4')
gem 'i18n', '~> 1.10.0'
gem "rbpdf", "~> 1.20.0"
gem 'addressable'
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-26 21:54:10 +0000
n15'>15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<!-- $Id$ -->
<testcase>
  <info>
    <p>
      This test checks markers (especially retrieve-boundary).
    </p>
  </info>
  <fo>
    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
      <fo:layout-master-set>
        <fo:simple-page-master master-name="normal" page-width="5in" page-height="2.55in">
          <fo:region-body margin="0.5in 0in"/>
          <fo:region-before extent="0.5in"/>
          <fo:region-after extent="0.5in"/>
        </fo:simple-page-master>
      </fo:layout-master-set>
      <fo:page-sequence master-reference="normal" white-space-collapse="true">
        <fo:static-content flow-name="xsl-region-before">
          <fo:block>
            page <fo:page-number/>
          </fo:block>
          <fo:block>
            <fo:retrieve-marker retrieve-class-name="PAGE" retrieve-boundary="page" retrieve-position="first-starting-within-page"/>
            <fo:retrieve-marker retrieve-class-name="PS" retrieve-boundary="page-sequence" retrieve-position="first-starting-within-page"/>
            <fo:retrieve-marker retrieve-class-name="DOC" retrieve-boundary="document" retrieve-position="first-starting-within-page"/>
          </fo:block>
        </fo:static-content>
        <fo:static-content flow-name="xsl-region-after">
          <fo:block text-align="end">
            <fo:retrieve-marker retrieve-class-name="PAGE" retrieve-boundary="page" retrieve-position="last-starting-within-page"/>
            <fo:retrieve-marker retrieve-class-name="PS" retrieve-boundary="page-sequence" retrieve-position="last-starting-within-page"/>
            <fo:retrieve-marker retrieve-class-name="DOC" retrieve-boundary="document" retrieve-position="last-starting-within-page"/>
          </fo:block>
          <fo:block text-align="end">
            <fo:retrieve-marker retrieve-class-name="PAGE" retrieve-boundary="page" retrieve-position="last-ending-within-page"/>
            <fo:retrieve-marker retrieve-class-name="PS" retrieve-boundary="page-sequence" retrieve-position="last-ending-within-page"/>
            <fo:retrieve-marker retrieve-class-name="DOC" retrieve-boundary="document" retrieve-position="last-ending-within-page"/>
          </fo:block>
        </fo:static-content>
        <fo:flow flow-name="xsl-region-body">
          <fo:block>
            <fo:block font-size="14pt" font-weight="bold">
              <fo:marker marker-class-name="PAGE">[PAGE]</fo:marker>
              <fo:marker marker-class-name="PS">[PS]</fo:marker>
              <fo:marker marker-class-name="DOC">[DOC]</fo:marker>
              Part 1
            </fo:block>
            <fo:block>text1</fo:block>
            <fo:block>text1</fo:block>
            <fo:block>text1</fo:block>
            <fo:block>text1</fo:block>
            <fo:block>text1</fo:block>
            <fo:block>text1</fo:block>
            <fo:block>text1</fo:block>
          </fo:block>
        </fo:flow>
      </fo:page-sequence>
      <fo:page-sequence master-reference="normal" white-space-collapse="true">
        <fo:static-content flow-name="xsl-region-before">
          <fo:block>
            page <fo:page-number/>
          </fo:block>
          <fo:block>
            <fo:retrieve-marker retrieve-class-name="PAGE" retrieve-boundary="page" retrieve-position="first-starting-within-page"/>
            <fo:retrieve-marker retrieve-class-name="PS" retrieve-boundary="page-sequence" retrieve-position="first-starting-within-page"/>
            <fo:retrieve-marker retrieve-class-name="DOC" retrieve-boundary="document" retrieve-position="first-starting-within-page"/>
          </fo:block>
        </fo:static-content>
        <fo:static-content flow-name="xsl-region-after">
          <fo:block text-align="end">
            <fo:retrieve-marker retrieve-class-name="PAGE" retrieve-boundary="page" retrieve-position="last-starting-within-page"/>
            <fo:retrieve-marker retrieve-class-name="PS" retrieve-boundary="page-sequence" retrieve-position="last-starting-within-page"/>
            <fo:retrieve-marker retrieve-class-name="DOC" retrieve-boundary="document" retrieve-position="last-starting-within-page"/>
          </fo:block>
          <fo:block text-align="end">
            <fo:retrieve-marker retrieve-class-name="PAGE" retrieve-boundary="page" retrieve-position="last-ending-within-page"/>
            <fo:retrieve-marker retrieve-class-name="PS" retrieve-boundary="page-sequence" retrieve-position="last-ending-within-page"/>
            <fo:retrieve-marker retrieve-class-name="DOC" retrieve-boundary="document" retrieve-position="last-ending-within-page"/>
          </fo:block>
        </fo:static-content>
        <fo:flow flow-name="xsl-region-body">
          <fo:block>
            <fo:block>sometext</fo:block>
            <fo:block>sometext</fo:block>
            <fo:block>sometext</fo:block>
            <fo:block>sometext</fo:block>
            <fo:block>sometext</fo:block>
            <fo:block>sometext</fo:block>
            <fo:block>sometext</fo:block>
            <fo:block>sometext</fo:block>
            <fo:block>sometext</fo:block>
          </fo:block>
        </fo:flow>
      </fo:page-sequence>
    </fo:root>
  </fo>
  <checks>
    <!-- First check that the page breaking is correct -->
    <eval expected="7" xpath="count(//pageSequence[1]/pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
    <eval expected="1" xpath="count(//pageSequence[1]/pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
    <eval expected="7" xpath="count(//pageSequence[2]/pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
    <eval expected="2" xpath="count(//pageSequence[2]/pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>

    <!-- Now we can check the markers -->
    <true xpath="boolean(//pageSequence[1]/pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[. = '[PAGE]'])"/> 
    <true xpath="boolean(//pageSequence[1]/pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[. = '[PS]'])"/> 
    <true xpath="boolean(//pageSequence[1]/pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[. = '[DOC]'])"/> 

    <true xpath="not(boolean(//pageSequence[1]/pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[. = '[PAGE]']))"/> 
    <true xpath="boolean(//pageSequence[1]/pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[. = '[PS]'])"/> 
    <true xpath="boolean(//pageSequence[1]/pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[. = '[DOC]'])"/> 

    <true xpath="not(boolean(//pageSequence[2]/pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[. = '[PAGE]']))"/> 
    <true xpath="not(boolean(//pageSequence[2]/pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[. = '[PS]']))"/> 
    <true xpath="boolean(//pageSequence[2]/pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[. = '[DOC]'])"/> 

    <!-- checking a second page in the second page-sequence due to the algorithm used -->
    <true xpath="not(boolean(//pageSequence[2]/pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[. = '[PAGE]']))"/> 
    <true xpath="not(boolean(//pageSequence[2]/pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[. = '[PS]']))"/> 
    <true xpath="boolean(//pageSequence[2]/pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[. = '[DOC]'])"/> 
  </checks>
</testcase>