You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/01/11 22:24:44 UTC
[maven-fluido-skin] branch MSKINS-204 updated (02ad751 -> 1e9c86a)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MSKINS-204
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
omit 02ad751 [MSKINS-204] Make MSKINS-76 ITs more tolerant
new 1e9c86a [MSKINS-204] Make MSKINS-76 ITs more tolerant
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (02ad751)
\
N -- N -- N refs/heads/MSKINS-204 (1e9c86a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/it/mskins-76/verify.groovy | 6 +++---
src/it/mskins-76_topbar/verify.groovy | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
[maven-fluido-skin] 01/01: [MSKINS-204] Make MSKINS-76 ITs more tolerant
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MSKINS-204
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
commit 1e9c86ac5e5d269c2bd70484e7c40854753d3b26
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 9 10:21:25 2023 +0100
[MSKINS-204] Make MSKINS-76 ITs more tolerant
This closes #44
---
src/it/mskins-76/verify.groovy | 9 +++++----
src/it/mskins-76_topbar/verify.groovy | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/it/mskins-76/verify.groovy b/src/it/mskins-76/verify.groovy
index 81e466b..72d4467 100644
--- a/src/it/mskins-76/verify.groovy
+++ b/src/it/mskins-76/verify.groovy
@@ -19,7 +19,8 @@
File index = new File( basedir, "target/site/index.html" )
assert index.exists()
-assert 1 == index.getText().count( '''\
+String html = index.getText().replaceAll( "\r?\n", System.lineSeparator() )
+assert 1 == html.count( '''\
<script>
/* <![CDATA[ */
(function() {
@@ -28,9 +29,9 @@ assert 1 == index.getText().count( '''\
s.src = 'https://api.flattr.com/js/0.6/load.js?mode=auto';
t.parentNode.insertBefore(s, t);
})();
- /* ]]> */</script>'''.replace( "\n", System.getProperty( "line.separator" ) ) )
+ /* ]]> */</script>'''.replaceAll( "\r?\n", System.lineSeparator() ) )
-assert 1 == index.getText().count( '''\
+assert 1 == html.count( '''\
<a class="FlattrButton" style="display:none;" href="http://opensource.org/"></a>
<noscript><a href="https://flattr.com/thing/448050/Open-Source-Initiative-OSI" target="_blank">
- <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border: 0;" /></a></noscript>'''.replace( "\n", System.getProperty( "line.separator" ) ) )
+ <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border: 0;" /></a></noscript>'''.replaceAll( "\r?\n", System.lineSeparator() ) )
diff --git a/src/it/mskins-76_topbar/verify.groovy b/src/it/mskins-76_topbar/verify.groovy
index 3dd79ba..30a161b 100644
--- a/src/it/mskins-76_topbar/verify.groovy
+++ b/src/it/mskins-76_topbar/verify.groovy
@@ -19,7 +19,8 @@
File index = new File( basedir, "target/site/index.html" )
assert index.exists()
-assert 1 == index.getText().count( '''\
+String html = index.getText().replaceAll( "\r?\n", System.lineSeparator() )
+assert 1 == html.count( '''\
<script>
/* <![CDATA[ */
(function() {
@@ -28,9 +29,9 @@ assert 1 == index.getText().count( '''\
s.src = 'https://api.flattr.com/js/0.6/load.js?mode=auto';
t.parentNode.insertBefore(s, t);
})();
- /* ]]> */</script>'''.replace( "\n", System.getProperty( "line.separator" ) ) )
+ /* ]]> */</script>'''.replaceAll( "\r?\n", System.lineSeparator() ) )
-assert 1 == index.getText().count( '''\
+assert 1 == html.count( '''\
<a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://opensource.org/"></a>
<noscript><a href="https://flattr.com/thing/448050/Open-Source-Initiative-OSI" target="_blank">
- <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border: 0;" /></a></noscript>'''.replace( "\n", System.getProperty( "line.separator" ) ) )
+ <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border: 0;" /></a></noscript>'''.replaceAll( "\r?\n", System.lineSeparator() ) )