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

Feat/create more space #324

Merged
merged 9 commits into from
Jan 16, 2024
6 changes: 3 additions & 3 deletions angular.json
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Im very curious what buildTarget is and why you changed to that instead of browserTarget. Ive never seen this before

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When running ng serve this is the warning i get:
image

Copy link
Member

@Matthbo Matthbo Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eh
image

Either the cli in the package.json is not matching with what you're running or something weird is going on
Edit: nvm forgot to update packages, ill check again

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do see some peer dependency issues
image

Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "ladybug:build:production"
"buildTarget": "ladybug:build:production"
},
"development": {
"browserTarget": "ladybug:build:development",
"buildTarget": "ladybug:build:development",
"proxyConfig": "src/proxy.conf.json"
}
},
Expand All @@ -92,7 +92,7 @@
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "ladybug:build"
"buildTarget": "ladybug:build"
}
},
"test": {
Expand Down
66 changes: 39 additions & 27 deletions cypress/e2e/copying.cy.js
Original file line number Diff line number Diff line change
@@ -1,39 +1,51 @@
describe('Tests about copying', function() {
describe("Tests about copying", function () {
beforeEach(() => {
cy.clearDebugStore();
})
});

afterEach(() => {
cy.get('li#testTab').click();
cy.get('#SelectAllButton').click();
cy.get('.row #DeleteSelectedButton').click();
cy.get('#confirmDeletion').click();
cy.get('#debugTab').click();
cy.get("li#testTab").click();
cy.get("#SelectAllButton").click();
cy.get(".row #DeleteSelectedButton").click();
cy.get("#confirmDeletion").click();
cy.get("#debugTab").click();
});

it('Copy report to test tab', () => {
cy.visit('');
cy.get('#testTab').click();
cy.get('#metadataTable tbody', {timeout: 10000}).find('tr').should('not.exist');
it("Copy report to test tab", () => {
cy.visit("");
cy.get("#testTab").click();
cy.get("#metadataTable tbody", { timeout: 10000 })
.find("tr")
.should("not.exist");
cy.createReport();
cy.get('#debugTab').click();
cy.get('#metadataTable tbody', {timeout: 10000}).find('tr').should('not.exist');
cy.get('.row #RefreshButton').click();
cy.get('#metadataTable tbody').find('tr').should('have.length', 1);
cy.get('button[id="SelectAllReportsButton"]').click();
cy.get("#debugTab").click();
cy.get("#metadataTable tbody", { timeout: 10000 })
.find("tr")
.should("not.exist");
cy.get(".row #RefreshButton").click();
cy.get("#metadataTable tbody").find("tr").should("have.length", 1);
cy.get("[data-cy-select-all-reports]").click();
cy.get('button[id="OpenSelectedReportsButton"]').click();
cy.get('#debug-tree .jqx-tree-dropdown-root > li').should('have.length', 1);
cy.get('button#CopyButton').click();
cy.get('li#testTab').click();
cy.get("#debug-tree .jqx-tree-dropdown-root > li").should("have.length", 1);
cy.get("button#CopyButton").click();
cy.get("li#testTab").click();
// We test that the user does not have to refresh here.
cy.get('tbody#testReports').find('tr').should('have.length', 1);
cy.get('tbody#testReports').find('tr').contains('/Simple report').should('have.length', 1);
cy.get('#debugTab').click();
cy.get('#metadataTable tbody', {timeout: 10000}).find('tr').should('have.length', 1);
cy.get('#debug-tree .jqx-tree-dropdown-root > li').should('have.length', 1);
cy.get('li#testTab').click();
cy.get("tbody#testReports").find("tr").should("have.length", 1);
cy.get("tbody#testReports")
.find("tr")
.contains("/Simple report")
.should("have.length", 1);
cy.get("#debugTab").click();
cy.get("#metadataTable tbody", { timeout: 10000 })
.find("tr")
.should("have.length", 1);
cy.get("#debug-tree .jqx-tree-dropdown-root > li").should("have.length", 1);
cy.get("li#testTab").click();
// Do not refresh. The test tab should have saved its state.
cy.get('tbody#testReports').find('tr').should('have.length', 1);
cy.get('tbody#testReports').find('tr').contains('/Simple report').should('have.length', 1);
cy.get("tbody#testReports").find("tr").should("have.length", 1);
cy.get("tbody#testReports")
.find("tr")
.contains("/Simple report")
.should("have.length", 1);
});
});
2 changes: 1 addition & 1 deletion cypress/e2e/debug_aboutOpenedReports.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ describe("About opened reports", function () {

it("Close one", function () {
cy.enableShowMultipleInDebugTree();
cy.get('button[id="SelectAllReportsButton"]').click();
cy.get("[data-cy-select-all-reports]").click();
cy.get('button[id="OpenSelectedReportsButton"]').click();
// Each of the two reports has three lines.
cy.get("#debug-tree .jqx-tree-dropdown-root > li").should("have.length", 2);
Expand Down
Loading
Loading