Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master to 1.8.0 #794

Merged
merged 31 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
16bc201
Bump @types/node from 20.16.5 to 20.16.9 in /backend
dependabot[bot] Sep 26, 2024
ea9816a
Frontend:
sMeilbeck Sep 26, 2024
09ca7d4
Backend:
sMeilbeck Sep 26, 2024
4ae4347
Merge pull request #732 from adessoSE/MinorUpdates
sMeilbeck Sep 26, 2024
cf0bcba
fix typo @ chromeOptions.binary_location
sMeilbeck Sep 27, 2024
3aa2917
real typo Fix
sMeilbeck Sep 27, 2024
1c1c7f7
test removal of chrome binaryLocation
sMeilbeck Sep 27, 2024
0288686
Merge pull request #733 from adessoSE/chromeBinaryServerTest
sMeilbeck Oct 2, 2024
c1e1edb
Merge pull request #726 from adessoSE/dependabot/npm_and_yarn/backend…
sMeilbeck Oct 2, 2024
af4ca75
Frontend:
sMeilbeck Oct 3, 2024
deb8738
Merge pull request #740 from adessoSE/MinorUpdates
sMeilbeck Oct 3, 2024
ed717fe
Bump @types/node from 20.16.9 to 20.16.10 in /backend
dependabot[bot] Oct 3, 2024
abc062b
Merge pull request #736 from adessoSE/dependabot/npm_and_yarn/backend…
sMeilbeck Oct 3, 2024
1c730e5
Updates to frontend & backend:
sMeilbeck Oct 10, 2024
2362c73
Merge pull request #748 from adessoSE/MinorUpdates
sMeilbeck Oct 10, 2024
4e458c1
Update packages:
sMeilbeck Oct 24, 2024
8bda763
Merge pull request #761 from adessoSE/MinorUpdates
sMeilbeck Oct 24, 2024
38340f2
Package updates (#772)
sMeilbeck Nov 7, 2024
8a8b139
fix ckeck, improve error report fo then Website
jonycoo Nov 8, 2024
f26403e
tollerate invalid github credentials when getting repos. (#773)
sMeilbeck Nov 8, 2024
a7311b6
Minor updates (#779)
sMeilbeck Nov 14, 2024
9926016
Merge branch 'dev' into CUC-726_Fix_ThenWebsite
jonycoo Nov 14, 2024
c4b2f78
trim and ignore trailing '/'
jonycoo Nov 14, 2024
7e0bfa5
simplify, use just regex
jonycoo Nov 14, 2024
5cad831
Merge pull request #774 from adessoSE/CUC-725_Fix_ThenWebsite
sMeilbeck Nov 15, 2024
338e504
Fixed Node version for version 1.8.0
sMeilbeck Nov 15, 2024
f871775
Public documentation (#780)
sMeilbeck Nov 27, 2024
9348c36
Minor updates & npm audit fix
sMeilbeck Nov 28, 2024
54b43ed
Merge pull request #793 from adessoSE/MinorUpdates
sMeilbeck Nov 28, 2024
4d1a3d4
Angular configuration modernization (#734)
sMeilbeck Nov 29, 2024
6935962
package-lock
sMeilbeck Nov 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ yarn-error.log
testem.log
/typings

# Documentation Styling
frontend/src/assets/documentation/styles/site.css

# environment variables
.env
environment.prod.ts
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ RUN add-apt-repository "deb [arch=amd64] https://packages.microsoft.com/repos/ed
RUN apt-get update && apt-get install -qq -y microsoft-edge-stable

# Install msedgedriver
RUN npm install --ignore-scripts -g edgedriver
RUN npm install --ignore-scripts -g edgedriver node-fetch

# Show Edge and EdgeDriver version
RUN microsoft-edge --version
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ RUN cat latest_stable.txt
# fi

# Install msedgedriver
RUN npm install --ignore-scripts -g edgedriver
RUN npm install --ignore-scripts -g edgedriver node-fetch

# Show Edge and EdgeDriver version
RUN microsoft-edge --version
Expand Down
3 changes: 1 addition & 2 deletions backend/features/step_definitions/stepdefs.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ edgeOptions.addArguments('--lang=de');
edgeOptions.addArguments('--excludeSwitches=enable-logging');
// chromeOptions.addArguments('--start-fullscreen');

chromeOptions.bynary_location = process.env.GOOGLE_CHROME_SHIM;
let currentParameters = {};

const NotFoundError = (e) => Error(`ElementNotFoundError: ${e}`);
Expand Down Expand Up @@ -623,7 +622,7 @@ Then('So I will be navigated to the website: {string}', async function checkUrl(
const world = this;
try {
await driver.getCurrentUrl().then(async (currentUrl) => {
expect(currentUrl).to.equal(url, 'Error');
expect(currentUrl.replace(/\/$/g, '') == url.replace(/[\s]|\/\s*$/g, '') , 'ERROR expected: ' + url.replace(/[\s]|\/\s*$/g, '') + '; actual: ' + currentUrl.replace(/\/$/g, '')).to.be.true
});
} catch (e) {
await driver.takeScreenshot().then(async (buffer) => {
Expand Down
Loading
Loading