Skip to content

Commit

Permalink
Merge branch '1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lomilar
Lomilar committed May 14, 2024
2 parents 3823676 + 56137b6 commit b25a1e4
Show file tree
Hide file tree
Showing 14 changed files with 1,044 additions and 2,881 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Change Log

## 1.5.56
* Merged PRs #307, #316 for P1 compatibility.
* OpenAPI swagger.json now validates.
* Updated libraries.
* Updated editor.

## 1.5.55
* Search results now retry search if enough results were not permissioned to the searcher.
* Updated libraries.
* Updated editor.

## 1.5.51
* Updated libraries.
* Updated editor.
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# CaSS
Competency and Skills Service -- Competency Management

Release Candidate: 1.5.51 [![Build Status](https://travis-ci.org/cassproject/CASS.svg?branch=1.5)](https://travis-ci.org/cassproject/CASS)
Release Candidate: 1.5.56 [![Build Status](https://travis-ci.org/cassproject/CASS.svg?branch=1.5)](https://travis-ci.org/cassproject/CASS)
Supported: 1.4 [![Build Status](https://travis-ci.org/cassproject/CASS.svg?branch=1.4)](https://travis-ci.org/cassproject/CASS)
Supported: 1.3 [![Build Status](https://travis-ci.org/cassproject/CASS.svg?branch=1.3)](https://travis-ci.org/cassproject/CASS)
Supported: 1.2 [![Build Status](https://travis-ci.org/cassproject/CASS.svg?branch=1.2)](https://travis-ci.org/cassproject/CASS)
Expand Down Expand Up @@ -98,6 +98,7 @@ Due to the performance improvements in the 1.5 version of CaSS, we highly recomm
* `npm install`
* `npm run testWithCoverage`
* In another command window, `npm run test:mocha` - Must not fail any tests.
* In another command window, `npm run openapi:validate` - Must not fail any tests.
* In the command window running testWithCoverage, `ctrl+c`. Record the output of the code coverage for the tests in codeCoverage.md.
* Update src/main/webapp to point at the appropriate gh-pages commit.
* Update CHANGELOG.md
Expand Down
135 changes: 60 additions & 75 deletions coverage/lcov-report/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,30 @@ <h1>All files</h1>
<div class='clearfix'>

<div class='fl pad1y space-right2'>
<span class="strong">28.16% </span>
<span class="strong">33.52% </span>
<span class="quiet">Statements</span>
<span class='fraction'>1967/6983</span>
<span class='fraction'>1964/5858</span>
</div>


<div class='fl pad1y space-right2'>
<span class="strong">20.74% </span>
<span class="strong">22.83% </span>
<span class="quiet">Branches</span>
<span class='fraction'>850/4097</span>
<span class='fraction'>849/3718</span>
</div>


<div class='fl pad1y space-right2'>
<span class="strong">28.11% </span>
<span class="strong">35.57% </span>
<span class="quiet">Functions</span>
<span class='fraction'>142/505</span>
<span class='fraction'>143/402</span>
</div>


<div class='fl pad1y space-right2'>
<span class="strong">28.54% </span>
<span class="strong">33.97% </span>
<span class="quiet">Lines</span>
<span class='fraction'>1918/6720</span>
<span class='fraction'>1915/5636</span>
</div>


Expand Down Expand Up @@ -95,62 +95,62 @@ <h1>All files</h1>

<tr>
<td class="file medium" data-value="main/server"><a href="main/server/index.html">main/server</a></td>
<td data-value="57.16" class="pic medium">
<div class="chart"><div class="cover-fill" style="width: 57%"></div><div class="cover-empty" style="width: 43%"></div></div>
<td data-value="62.55" class="pic medium">
<div class="chart"><div class="cover-fill" style="width: 62%"></div><div class="cover-empty" style="width: 38%"></div></div>
</td>
<td data-value="57.16" class="pct medium">57.16%</td>
<td data-value="2045" class="abs medium">1169/2045</td>
<td data-value="51.15" class="pct medium">51.15%</td>
<td data-value="1079" class="abs medium">552/1079</td>
<td data-value="69.35" class="pct medium">69.35%</td>
<td data-value="124" class="abs medium">86/124</td>
<td data-value="56.89" class="pct medium">56.89%</td>
<td data-value="1986" class="abs medium">1130/1986</td>
<td data-value="62.55" class="pct medium">62.55%</td>
<td data-value="1872" class="abs medium">1171/1872</td>
<td data-value="51.29" class="pct medium">51.29%</td>
<td data-value="1082" class="abs medium">555/1082</td>
<td data-value="75.86" class="pct medium">75.86%</td>
<td data-value="116" class="abs medium">88/116</td>
<td data-value="62.43" class="pct medium">62.43%</td>
<td data-value="1813" class="abs medium">1132/1813</td>
</tr>

<tr>
<td class="file low" data-value="main/server/adapter/asn"><a href="main/server/adapter/asn/index.html">main/server/adapter/asn</a></td>
<td data-value="4.13" class="pic low">
<td data-value="4.3" class="pic low">
<div class="chart"><div class="cover-fill" style="width: 4%"></div><div class="cover-empty" style="width: 96%"></div></div>
</td>
<td data-value="4.13" class="pct low">4.13%</td>
<td data-value="460" class="abs low">19/460</td>
<td data-value="4.3" class="pct low">4.3%</td>
<td data-value="441" class="abs low">19/441</td>
<td data-value="2.72" class="pct low">2.72%</td>
<td data-value="330" class="abs low">9/330</td>
<td data-value="11.76" class="pct low">11.76%</td>
<td data-value="17" class="abs low">2/17</td>
<td data-value="4.24" class="pct low">4.24%</td>
<td data-value="448" class="abs low">19/448</td>
<td data-value="15.38" class="pct low">15.38%</td>
<td data-value="13" class="abs low">2/13</td>
<td data-value="4.42" class="pct low">4.42%</td>
<td data-value="429" class="abs low">19/429</td>
</tr>

<tr>
<td class="file low" data-value="main/server/adapter/case"><a href="main/server/adapter/case/index.html">main/server/adapter/case</a></td>
<td data-value="17.07" class="pic low">
<td data-value="17.83" class="pic low">
<div class="chart"><div class="cover-fill" style="width: 17%"></div><div class="cover-empty" style="width: 83%"></div></div>
</td>
<td data-value="17.07" class="pct low">17.07%</td>
<td data-value="492" class="abs low">84/492</td>
<td data-value="17.83" class="pct low">17.83%</td>
<td data-value="471" class="abs low">84/471</td>
<td data-value="7.11" class="pct low">7.11%</td>
<td data-value="225" class="abs low">16/225</td>
<td data-value="9.8" class="pct low">9.8%</td>
<td data-value="51" class="abs low">5/51</td>
<td data-value="17.4" class="pct low">17.4%</td>
<td data-value="477" class="abs low">83/477</td>
<td data-value="10.86" class="pct low">10.86%</td>
<td data-value="46" class="abs low">5/46</td>
<td data-value="18.2" class="pct low">18.2%</td>
<td data-value="456" class="abs low">83/456</td>
</tr>

<tr>
<td class="file low" data-value="main/server/adapter/ceasn"><a href="main/server/adapter/ceasn/index.html">main/server/adapter/ceasn</a></td>
<td data-value="13.37" class="pic low">
<td data-value="13.82" class="pic low">
<div class="chart"><div class="cover-fill" style="width: 13%"></div><div class="cover-empty" style="width: 87%"></div></div>
</td>
<td data-value="13.37" class="pct low">13.37%</td>
<td data-value="1361" class="abs low">182/1361</td>
<td data-value="13.82" class="pct low">13.82%</td>
<td data-value="1316" class="abs low">182/1316</td>
<td data-value="8.8" class="pct low">8.8%</td>
<td data-value="999" class="abs low">88/999</td>
<td data-value="15.09" class="pct low">15.09%</td>
<td data-value="53" class="abs low">8/53</td>
<td data-value="13.49" class="pct low">13.49%</td>
<td data-value="1304" class="abs low">176/1304</td>
<td data-value="17.02" class="pct low">17.02%</td>
<td data-value="47" class="abs low">8/47</td>
<td data-value="13.97" class="pct low">13.97%</td>
<td data-value="1259" class="abs low">176/1259</td>
</tr>

<tr>
Expand Down Expand Up @@ -230,47 +230,32 @@ <h1>All files</h1>

<tr>
<td class="file low" data-value="main/server/profile"><a href="main/server/profile/index.html">main/server/profile</a></td>
<td data-value="4.61" class="pic low">
<div class="chart"><div class="cover-fill" style="width: 4%"></div><div class="cover-empty" style="width: 96%"></div></div>
</td>
<td data-value="4.61" class="pct low">4.61%</td>
<td data-value="498" class="abs low">23/498</td>
<td data-value="0.45" class="pct low">0.45%</td>
<td data-value="218" class="abs low">1/218</td>
<td data-value="2.85" class="pct low">2.85%</td>
<td data-value="35" class="abs low">1/35</td>
<td data-value="4.97" class="pct low">4.97%</td>
<td data-value="462" class="abs low">23/462</td>
</tr>

<tr>
<td class="file low" data-value="main/server/profile/coprocessors"><a href="main/server/profile/coprocessors/index.html">main/server/profile/coprocessors</a></td>
<td data-value="0" class="pic low">
<div class="chart"><div class="cover-fill" style="width: 0%"></div><div class="cover-empty" style="width: 100%"></div></div>
<td data-value="15.54" class="pic low">
<div class="chart"><div class="cover-fill" style="width: 15%"></div><div class="cover-empty" style="width: 85%"></div></div>
</td>
<td data-value="0" class="pct low">0%</td>
<td data-value="517" class="abs low">0/517</td>
<td data-value="0" class="pct low">0%</td>
<td data-value="268" class="abs low">0/268</td>
<td data-value="0" class="pct low">0%</td>
<td data-value="56" class="abs low">0/56</td>
<td data-value="0" class="pct low">0%</td>
<td data-value="496" class="abs low">0/496</td>
<td data-value="15.54" class="pct low">15.54%</td>
<td data-value="148" class="abs low">23/148</td>
<td data-value="0.96" class="pct low">0.96%</td>
<td data-value="104" class="abs low">1/104</td>
<td data-value="9.09" class="pct low">9.09%</td>
<td data-value="11" class="abs low">1/11</td>
<td data-value="17.42" class="pct low">17.42%</td>
<td data-value="132" class="abs low">23/132</td>
</tr>

<tr>
<td class="file low" data-value="main/server/shims"><a href="main/server/shims/index.html">main/server/shims</a></td>
<td data-value="39.32" class="pic low">
<div class="chart"><div class="cover-fill" style="width: 39%"></div><div class="cover-empty" style="width: 61%"></div></div>
<td data-value="38.74" class="pic low">
<div class="chart"><div class="cover-fill" style="width: 38%"></div><div class="cover-empty" style="width: 62%"></div></div>
</td>
<td data-value="39.32" class="pct low">39.32%</td>
<td data-value="862" class="abs low">339/862</td>
<td data-value="25" class="pct low">25%</td>
<td data-value="592" class="abs low">148/592</td>
<td data-value="31.19" class="pct low">31.19%</td>
<td data-value="109" class="abs low">34/109</td>
<td data-value="40.77" class="pct low">40.77%</td>
<td data-value="824" class="abs low">336/824</td>
<td data-value="38.74" class="pct low">38.74%</td>
<td data-value="862" class="abs low">334/862</td>
<td data-value="24.32" class="pct low">24.32%</td>
<td data-value="592" class="abs low">144/592</td>
<td data-value="30.27" class="pct low">30.27%</td>
<td data-value="109" class="abs low">33/109</td>
<td data-value="40.16" class="pct low">40.16%</td>
<td data-value="824" class="abs low">331/824</td>
</tr>

</tbody>
Expand All @@ -281,7 +266,7 @@ <h1>All files</h1>
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2024-03-28T00:28:42.622Z
at 2024-04-17T00:52:27.797Z
</div>
<script src="prettify.js"></script>
<script>
Expand Down
Loading

0 comments on commit b25a1e4

Please sign in to comment.