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

New sdk tests fix #1667

Closed
wants to merge 51 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
8d3a968
feat: add the new auth service to prepare for the new sdk
martin-trajanovski Oct 29, 2024
3b39b75
try to fix some ai-bot review suggestions
martin-trajanovski Oct 31, 2024
b2d524c
add the note for the good review suggestion from ai-bot
martin-trajanovski Oct 31, 2024
a872cf2
remove old sdk and adjust types against the new one
martin-trajanovski Oct 31, 2024
94cb109
fix more types and issues against the new sdk
martin-trajanovski Nov 1, 2024
78de88f
finalize type error fixes
martin-trajanovski Nov 1, 2024
3840cc1
remove prefix
martin-trajanovski Nov 1, 2024
abe2d8e
add the new sdk generation script for local development
martin-trajanovski Nov 1, 2024
0489f0d
Merge pull request #1632 from SciCatProject/SWAP-4278-new-sdk-frotnen…
martin-trajanovski Nov 1, 2024
7947926
Merge branch 'master' of https://github.com/SciCatProject/frontend in…
martin-trajanovski Nov 4, 2024
5863345
resolve merge conflicts
martin-trajanovski Nov 4, 2024
ecd92bb
resolve merge conflicts
martin-trajanovski Nov 4, 2024
0271a43
start fixing TODOs after newly generated sdk
martin-trajanovski Nov 4, 2024
04f5ac1
Merge pull request #1636 from SciCatProject/SWAP-4278-new-sdk-frotnen…
nitrosx Nov 5, 2024
53186ae
Merge pull request #1637 from SciCatProject/SWAP-4278-new-sdk-frotnen…
nitrosx Nov 5, 2024
6ddd5cb
fixed sdk local generation for linux
nitrosx Nov 5, 2024
40e107c
update the sdk package version and fix some more types
martin-trajanovski Nov 6, 2024
0d897af
detect the OS and use the right current directory path
martin-trajanovski Nov 6, 2024
729a735
Merge pull request #1644 from SciCatProject/fix-sdk-local-generation
nitrosx Nov 6, 2024
ef06cc8
Merge branch 'master' of https://github.com/SciCatProject/frontend in…
martin-trajanovski Nov 6, 2024
3597d0d
Merge branch 'new-sdk-release' of https://github.com/SciCatProject/fr…
martin-trajanovski Nov 6, 2024
7c74cc6
improve types and fix more TODOs
martin-trajanovski Nov 6, 2024
9db7588
improve types and fix TODOs after backend improvements
martin-trajanovski Nov 7, 2024
e98f417
finalize TODOs and FIXMEs fixes and type improvements with the new sdk
martin-trajanovski Nov 8, 2024
82c7ba9
fix some sourcery-ai comments
martin-trajanovski Nov 8, 2024
8d0dec8
fix some of the last TODOs
martin-trajanovski Nov 8, 2024
0271c1c
adapted sdk generation to unix environment
nitrosx Nov 11, 2024
f471a23
Merge pull request #1648 from SciCatProject/fix-unix-sdk-generation
nitrosx Nov 12, 2024
f6f2bfb
Merge pull request #1647 from SciCatProject/SWAP-4278-new-sdk-frotnen…
nitrosx Nov 12, 2024
5f12e14
ignore the @scicatproject that is generated with the sdk
martin-trajanovski Nov 12, 2024
8a9f89c
resolve merge conflicts
martin-trajanovski Nov 13, 2024
2ab7a73
resolve merge conflicts
martin-trajanovski Nov 18, 2024
e8f08fd
Merge branch 'master' into new-sdk-release
martin-trajanovski Nov 19, 2024
f54b1db
start fixing tests with the new sdk
martin-trajanovski Nov 19, 2024
1efa821
add needed stub classes and fix some more tests
martin-trajanovski Nov 20, 2024
303e1b7
resolve merge conflicts and fix types after recent changes
martin-trajanovski Nov 20, 2024
a98ff14
Merge branch 'new-sdk-release' of https://github.com/SciCatProject/fr…
martin-trajanovski Nov 20, 2024
464ba8c
continue fixing unit tests
martin-trajanovski Nov 20, 2024
3c54858
try to fix e2e tests and revert some changes that need more attention…
martin-trajanovski Nov 21, 2024
066f6f7
changes to just run the tests
martin-trajanovski Nov 21, 2024
db0eecf
use latest sdk
martin-trajanovski Nov 21, 2024
4f37b80
update package-lock file
martin-trajanovski Nov 21, 2024
76bd6fd
fixing unit tests
martin-trajanovski Nov 21, 2024
37260d3
fix more unit tests
martin-trajanovski Nov 22, 2024
f63b432
continue fixing tests
martin-trajanovski Nov 22, 2024
fb4fc01
update the sdk
martin-trajanovski Nov 25, 2024
8d38fda
fix last e2e test
martin-trajanovski Nov 25, 2024
24dcebb
fix thumbnail unit tests
martin-trajanovski Nov 25, 2024
047afbf
revert some change
martin-trajanovski Nov 25, 2024
dcff2ab
finalize fixing unit tests
martin-trajanovski Nov 25, 2024
76c8fcf
revert the backend image changes after the tests pass
martin-trajanovski Nov 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
/out-tsc
# Only exists if Bazel was run
/bazel-out
@scicatproject/

# dependencies
/node_modules
Expand Down
6 changes: 3 additions & 3 deletions cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { defineConfig } from "cypress";

export default defineConfig({
env: {
lbBaseUrl: "http://localhost:3000/api/v3",
lbLoginEndpoint: "/auth/login",
lbTokenPrefix: "Bearer ",
baseUrl: "http://localhost:3000/api/v3",
loginEndpoint: "/auth/login",
tokenPrefix: "Bearer",
username: "admin",
password: "27f5fd86ae68fe740eef42b8bbd1d7d5",
secondaryUsername: "archiveManager",
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/datasets/datasets-attachment.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ describe("Dataset attachments", () => {
beforeEach(() => {
cy.login(Cypress.env("username"), Cypress.env("password"));

cy.intercept("POST", "/api/v3/Datasets/**/*").as("upload");
cy.intercept("POST", "/api/v3/datasets/**/*").as("upload");
});

after(() => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/datasets/datasets-datafiles.cy.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
describe("Dataset datafiles", () => {
beforeEach(() => {
cy.login(Cypress.env("username"), Cypress.env("password"));
cy.intercept("PATCH", "/api/v3/Datasets/**/*").as("change");
cy.intercept("PATCH", "/api/v3/datasets/**/*").as("change");
cy.intercept("GET", "*").as("fetch");
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/datasets/datasets-keyword.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ describe("Datasets", () => {
beforeEach(() => {
cy.login(Cypress.env("username"), Cypress.env("password"));

cy.intercept("PATCH", "/api/v3/Datasets/**/*").as("keyword");
cy.intercept("PATCH", "/api/v3/datasets/**/*").as("keyword");
cy.intercept("GET", "*").as("fetch");
});

Expand Down
4 changes: 3 additions & 1 deletion cypress/e2e/datasets/datasets-metadata.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe("Datasets", () => {
beforeEach(() => {
cy.login(Cypress.env("username"), Cypress.env("password"));

cy.intercept("PATCH", "/api/v3/Datasets/**/*").as("metadata");
cy.intercept("PATCH", "/api/v3/datasets/**/*").as("metadata");
cy.intercept("GET", "*").as("fetch");
});

Expand Down Expand Up @@ -67,6 +67,8 @@ describe("Datasets", () => {

cy.get("button[data-cy=save-changes-button]").click();

cy.finishedLoading();

cy.wait("@metadata").then(({ request, response }) => {
expect(request.method).to.eq("PATCH");
expect(response.statusCode).to.eq(200);
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/datasets/datasets-public.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ describe("Datasets", () => {

cy.createDataset("raw");

cy.intercept("PATCH", "/api/v3/Datasets/**/*").as("change");
cy.intercept("PATCH", "/api/v3/datasets/**/*").as("change");
cy.intercept("GET", "*").as("fetch");
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/datasets/datasets-reduce.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ describe("Datasets", () => {
beforeEach(() => {
cy.login(Cypress.env("username"), Cypress.env("password"));

cy.intercept("PATCH", "/api/v3/Datasets/**/*").as("metadata");
cy.intercept("PATCH", "/api/v3/datasets/**/*").as("metadata");
cy.intercept("GET", "*").as("fetch");
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/other/policy-delegate.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ describe("Policies", () => {
beforeEach(() => {
cy.login(Cypress.env("username"), Cypress.env("password"));

cy.intercept("POST", "/api/v3/Policies/**/*").as("update");
cy.intercept("POST", "/api/v3/policies/**/*").as("update");
cy.intercept("GET", "*").as("fetch");
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/other/users-login.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ describe("Users Login", () => {
const guestUsername = Cypress.env("guestUsername");
const guestPassword = Cypress.env("guestPassword");

const loginEndpoint = Cypress.env("lbLoginEndpoint");
const loginEndpoint = Cypress.env("loginEndpoint");

beforeEach(() => {
cy.intercept("POST", "**/auth/msad").as("adLogin");
Expand Down
Loading
Loading