Few changes in tests to pass with the modifications applied to npm

stronk7 · stronk7 · commit 27846ebd821c · 2023-02-07T15:39:54.000+01:00
diff --git a/tests/1-grunt_process.bats b/tests/1-grunt_process.bats
@@ -47,9 +47,9 @@ setup () {
     # When a third party library is added, developers need to commit
     # ignorefiles change since 3.2.
 
-    # Testing on in-dev 3.2dev
-    create_git_branch 32-dev 5a1728df39116fc701cc907e85a638aa7674f416
-    git_apply_fixture 32-thirdparty-lib-added.patch
+    # Testing on v3.5.9
+    create_git_branch 35-stable v3.5.9
+    git_apply_fixture 35-thirdparty-lib-added.patch
 
     # Run test
     ci_run grunt_process/grunt_process.sh
@@ -64,9 +64,9 @@ setup () {
     # When a 3rd party library is added, but we are checking a 3rd part plugin
     # we ignore any change in ignorefiles.
 
-    # Testing on in-dev 3.2dev
-    create_git_branch 32-dev 5a1728df39116fc701cc907e85a638aa7674f416
-    git_apply_fixture 32-thirdparty-lib-added.patch
+    # Testing on v3.5.9
+    create_git_branch 35-stable v3.5.9
+    git_apply_fixture 35-thirdparty-lib-added.patch
 
     # Run test
     export isplugin=1
diff --git a/tests/2-remote_branch_checker.bats b/tests/2-remote_branch_checker.bats
@@ -31,9 +31,11 @@ assert_prechecker () {
     assert_files_same $smurfxmlfixture $WORKSPACE/work/smurf.xml
 }
 
-@test "remote_branch_checker/remote_branch_checker.sh: old branch failing" {
-    # An extremely old branch running jshint..
-    assert_prechecker local_ci_fixture_oldbranch MDLSITE-3899 v2.9.0-rc1
+@test "remote_branch_checker/remote_branch_checker.sh: old branch (38_STABLE) failing" {
+    # An extremely old branch. MOODLE_38_STABLE (with node v14) is the oldest we support.
+    # (note MOODLE_35_STABLE and up also is supported but not v3.5.0, v3.6.0...  support came later and
+    # we need to use always .0 versions in the tests as base, so 3.8.0 is the very first .0).
+    assert_prechecker local_ci_fixture_oldbranch_38 MDLSITE-3899 v3.8.0
 }
 
 @test "remote_branch_checker/remote_branch_checker.sh: all possible checks failing" {
diff --git a/tests/3-prepare_npm_stuff.bats b/tests/3-prepare_npm_stuff.bats
@@ -63,6 +63,10 @@ setup () {
     # Assert result.
     # Cannot know if install will success or no (depends if npm/node binaries are elsewhere)
     # (hence, we are not asserting the result, just that the case is handled)
+
+    # Note this can end with some warnings if npm/node is not installed elsewhere and with
+    # exit status = 2, but, as commented above, we are not asserting that here (success / failure...)
+    # so that's ok.
     assert_output --partial "INFO: nvm not found, installing via git"
     assert_output --partial "INFO: nvm git installation found, updating to latest release"
     assert_output --partial "INFO: using nvm version:"
diff --git a/tests/fixtures/35-thirdparty-lib-added.patch b/tests/fixtures/35-thirdparty-lib-added.patch
@@ -1,19 +1,19 @@
-From 4600d7d6fd5d5bd4f5bae80c3e89b838d95f2b1d Mon Sep 17 00:00:00 2001
+From 96ec9462a7d7a05f39af044020b63e371831ab05 Mon Sep 17 00:00:00 2001
 From: Dan Poltawski <dan@moodle.com>
 Date: Tue, 12 Jul 2016 11:23:56 +0100
-Subject: [PATCH 1/1] MDLSITE-4678 fixture: adding third party lib
+Subject: [PATCH] MDLSITE-4678 fixture: adding third party lib
 
 ---
  lib/thirdpartylibs.xml | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
-index 6440a73..3385d2f 100644
+index c14a3e01d4..ba719b5f84 100644
 --- a/lib/thirdpartylibs.xml
 +++ b/lib/thirdpartylibs.xml
-@@ -275,4 +275,10 @@
-     <license>GPL</license>
-     <version>2.3.0</version>
+@@ -323,4 +323,10 @@
+     <license>MIT</license>
+     <version>1.1.1</version>
    </library>
 +  <library>
 +    <location>integrationtest</location>
@@ -23,5 +23,5 @@ index 6440a73..3385d2f 100644
 +  </library>
  </libraries>
 -- 
-2.9.0
+2.39.1
 
diff --git a/tests/fixtures/remote_branch_checker/local_ci_fixture_oldbranch_38.xml b/tests/fixtures/remote_branch_checker/local_ci_fixture_oldbranch_38.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0"?>
-<smurf version="0.9.1" numerrors="4" numwarnings="1">
-  <summary status="error" numerrors="4" numwarnings="1" condensedresult="smurf,error,4,1:phplint,success,0,0;phpcs,success,0,0;phpdoc,success,0,0;commit,error,3,0;savepoint,success,0,0;thirdparty,success,0,0;externalbackup,success,0,0;grunt,error,1,1;shifter,success,0,0;mustache,success,0,0">
+<smurf version="0.9.1" numerrors="9" numwarnings="1">
+  <summary status="error" numerrors="9" numwarnings="1" condensedresult="smurf,error,9,1:phplint,success,0,0;phpcs,success,0,0;js,error,5,0;css,success,0,0;phpdoc,success,0,0;commit,error,3,0;savepoint,success,0,0;thirdparty,success,0,0;externalbackup,success,0,0;grunt,error,1,1;shifter,success,0,0;mustache,success,0,0;gherkin,success,0,0">
     <detail name="phplint" status="success" numerrors="0" numwarnings="0"/>
     <detail name="phpcs" status="success" numerrors="0" numwarnings="0"/>
+    <detail name="js" status="error" numerrors="5" numwarnings="0"/>
+    <detail name="css" status="success" numerrors="0" numwarnings="0"/>
     <detail name="phpdoc" status="success" numerrors="0" numwarnings="0"/>
     <detail name="commit" status="error" numerrors="3" numwarnings="0"/>
     <detail name="savepoint" status="success" numerrors="0" numwarnings="0"/>
@@ -11,6 +13,7 @@
     <detail name="grunt" status="error" numerrors="1" numwarnings="1"/>
     <detail name="shifter" status="success" numerrors="0" numwarnings="0"/>
     <detail name="mustache" status="success" numerrors="0" numwarnings="0"/>
+    <detail name="gherkin" status="success" numerrors="0" numwarnings="0"/>
   </summary>
   <check id="phplint" title="PHP lint problems" url="http://php.net/docs.php" numerrors="0" numwarnings="0" allowfiltering="0">
     <description>This section shows php lint problems in the code detected by php -l</description>
@@ -20,24 +23,58 @@
     <description>This section shows the coding style problems detected in the code by phpcs</description>
     <mess/>
   </check>
+  <check id="js" title="Javascript coding style problems" url="https://docs.moodle.org/dev/Javascript/Coding_style" numerrors="5" numwarnings="0" allowfiltering="1">
+    <description>This section shows the coding style problems detected in the code by eslint</description>
+    <mess>
+      <problem file="lib/amd/src/ajax.js" linefrom="42" lineto="42" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/blob/b7af412184b8936cb0af859c417a854bd2372f41/lib/amd/src/ajax.js#L42" ruleset="eslint" rule="rules.no-unused-vars" url="https://docs.moodle.org/dev/Javascript/Coding_style" type="error" weight="5">
+        <message>'foo' is assigned a value but never used. (no-unused-vars)</message>
+        <description/>
+        <code/>
+      </problem>
+      <problem file="lib/amd/src/ajax.js" linefrom="42" lineto="42" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/blob/b7af412184b8936cb0af859c417a854bd2372f41/lib/amd/src/ajax.js#L42" ruleset="eslint" rule="rules.babel/semi" url="https://docs.moodle.org/dev/Javascript/Coding_style" type="error" weight="5">
+        <message>Missing semicolon. (babel/semi)</message>
+        <description/>
+        <code/>
+      </problem>
+      <problem file="lib/javascript-static.js" linefrom="9" lineto="9" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/blob/b7af412184b8936cb0af859c417a854bd2372f41/lib/javascript-static.js#L9" ruleset="eslint" rule="rules.no-unused-vars" url="https://docs.moodle.org/dev/Javascript/Coding_style" type="error" weight="5">
+        <message>'foo' is assigned a value but never used. (no-unused-vars)</message>
+        <description/>
+        <code/>
+      </problem>
+      <problem file="lib/javascript-static.js" linefrom="9" lineto="9" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/blob/b7af412184b8936cb0af859c417a854bd2372f41/lib/javascript-static.js#L9" ruleset="eslint" rule="rules.semi" url="https://docs.moodle.org/dev/Javascript/Coding_style" type="error" weight="5">
+        <message>Missing semicolon. (semi)</message>
+        <description/>
+        <code/>
+      </problem>
+      <problem file="lib/yui/src/tooltip/js/tooltip.js" linefrom="16" lineto="16" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/blob/b7af412184b8936cb0af859c417a854bd2372f41/lib/yui/src/tooltip/js/tooltip.js#L16" ruleset="eslint" rule="rules.semi" url="https://docs.moodle.org/dev/Javascript/Coding_style" type="error" weight="5">
+        <message>Missing semicolon. (semi)</message>
+        <description/>
+        <code/>
+      </problem>
+    </mess>
+  </check>
+  <check id="css" title="CSS problems" url="https://docs.moodle.org/dev/CSS_coding_style" numerrors="0" numwarnings="0" allowfiltering="1">
+    <description>This section shows CSS problems detected by stylelint</description>
+    <mess/>
+  </check>
   <check id="phpdoc" title="PHPDocs style problems" url="https://docs.moodle.org/dev/Coding_style" numerrors="0" numwarnings="0" allowfiltering="1">
     <description>This section shows the phpdocs problems detected in the code by local_moodlecheck</description>
     <mess/>
   </check>
   <check id="commit" title="Commit messages problems" url="https://docs.moodle.org/dev/Commit_cheat_sheet#Provide_clear_commit_messages" numerrors="3" numwarnings="0" allowfiltering="1">
     <description>This section shows the problems detected in the commit messages by the commits checker</description>
     <mess>
-      <problem file="8b0f63da17" linefrom="0" lineto="0" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/commit/8b0f63da17" ruleset="moodle" rule="" url="https://docs.moodle.org/dev/Commit_cheat_sheet#Provide_clear_commit_messages" type="error" weight="3">
+      <problem file="b7af412184" linefrom="0" lineto="0" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/commit/b7af412184" ruleset="moodle" rule="" url="https://docs.moodle.org/dev/Commit_cheat_sheet#Provide_clear_commit_messages" type="error" weight="3">
         <message>The commit message does not begin with the expected issue code MDL-[0-9]{3,6} and a space. </message>
         <description/>
         <code/>
       </problem>
-      <problem file="536542c7f0" linefrom="0" lineto="0" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/commit/536542c7f0" ruleset="moodle" rule="" url="https://docs.moodle.org/dev/Commit_cheat_sheet#Provide_clear_commit_messages" type="error" weight="3">
+      <problem file="866e4150c3" linefrom="0" lineto="0" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/commit/866e4150c3" ruleset="moodle" rule="" url="https://docs.moodle.org/dev/Commit_cheat_sheet#Provide_clear_commit_messages" type="error" weight="3">
         <message>The commit message does not begin with the expected issue code MDL-[0-9]{3,6} and a space. </message>
         <description/>
         <code/>
       </problem>
-      <problem file="a9d19ab512" linefrom="0" lineto="0" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/commit/a9d19ab512" ruleset="moodle" rule="" url="https://docs.moodle.org/dev/Commit_cheat_sheet#Provide_clear_commit_messages" type="error" weight="3">
+      <problem file="60aa3dda7a" linefrom="0" lineto="0" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/commit/60aa3dda7a" ruleset="moodle" rule="" url="https://docs.moodle.org/dev/Commit_cheat_sheet#Provide_clear_commit_messages" type="error" weight="3">
         <message>The commit message does not begin with the expected issue code MDL-[0-9]{3,6} and a space. </message>
         <description/>
         <code/>
@@ -59,13 +96,13 @@
   <check id="grunt" title="grunt changes" url="https://docs.moodle.org/dev/Grunt" numerrors="1" numwarnings="1" allowfiltering="0">
     <description>This section shows files built by grunt and not commited</description>
     <mess>
-      <problem file="" linefrom="0" lineto="0" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/blob/8b0f63da1743bd175115ea9e07d298dd19500f9b/#L0" ruleset="moodle" rule="" url="https://docs.moodle.org/dev/Grunt" type="error" weight="5">
+      <problem file="" linefrom="0" lineto="0" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/blob/b7af412184b8936cb0af859c417a854bd2372f41/#L0" ruleset="moodle" rule="" url="https://docs.moodle.org/dev/Grunt" type="error" weight="5">
         <message>Problems running grunt</message>
         <description/>
         <code/>
       </problem>
-      <problem file="" linefrom="0" lineto="0" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/blob/8b0f63da1743bd175115ea9e07d298dd19500f9b/#L0" ruleset="moodle" rule="" url="https://docs.moodle.org/dev/Grunt" type="warning" weight="1">
-        <message>Task "jshint:files" failed. Use --force to continue.</message>
+      <problem file="" linefrom="0" lineto="0" method="" class="" package="" api="" diffurl="https://git.in.moodle.com/integration/prechecker/blob/b7af412184b8936cb0af859c417a854bd2372f41/#L0" ruleset="moodle" rule="" url="https://docs.moodle.org/dev/Grunt" type="warning" weight="1">
+        <message>Task "eslint:amd" failed. Use --force to continue.</message>
         <description/>
         <code/>
       </problem>
@@ -79,4 +116,8 @@
     <description>This section shows problems detected in mustache templates</description>
     <mess/>
   </check>
+  <check id="gherkin" title="Gherkin .feature problems" url="https://docs.moodle.org/dev/Writing_acceptance_tests" numerrors="0" numwarnings="0" allowfiltering="1">
+    <description>This section shows problems detected in behat .feature files</description>
+    <mess/>
+  </check>
 </smurf>

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,11 @@ assert_prechecker () {`
`31`	`31`	`assert_files_same $smurfxmlfixture $WORKSPACE/work/smurf.xml`
`32`	`32`	`}`
`33`	`33`
`34`		`-@test "remote_branch_checker/remote_branch_checker.sh: old branch failing" {`
`35`		`- # An extremely old branch running jshint..`
`36`		`- assert_prechecker local_ci_fixture_oldbranch MDLSITE-3899 v2.9.0-rc1`
	`34`	`+@test "remote_branch_checker/remote_branch_checker.sh: old branch (38_STABLE) failing" {`
	`35`	`+ # An extremely old branch. MOODLE_38_STABLE (with node v14) is the oldest we support.`
	`36`	`+ # (note MOODLE_35_STABLE and up also is supported but not v3.5.0, v3.6.0... support came later and`
	`37`	`+ # we need to use always .0 versions in the tests as base, so 3.8.0 is the very first .0).`
	`38`	`+ assert_prechecker local_ci_fixture_oldbranch_38 MDLSITE-3899 v3.8.0`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`@test "remote_branch_checker/remote_branch_checker.sh: all possible checks failing" {`