Skip to content

Commit

Permalink
Style guide formatting; removed pizzly dependency; changed host for vite
Browse files Browse the repository at this point in the history
  • Loading branch information
xJREB committed Dec 5, 2023
1 parent 572b674 commit b122384
Show file tree
Hide file tree
Showing 23 changed files with 838 additions and 746 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ bower_components

# cypress
cypress.env.json
cypress/downloads

# node-waf configuration
.lock-wscript
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/adrManagerTest/AddNewAdr.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ context("Adding a new ADR to a repo", () => {
it("Create a new ADR", () => {
window.localStorage.clear();
window.localStorage.setItem("authId", Cypress.env("OAUTH_E2E_AUTH_ID"));
window.localStorage.setItem("user", Cypress.env("USER"))
window.localStorage.setItem("user", Cypress.env("USER"));
cy.visit(TEST_BASE_URL);
// add the ADR-Manager repo
cy.intercept('GET', REST_LIST_REPO_URL).as("getRepos");
cy.intercept("GET", REST_LIST_REPO_URL).as("getRepos");
cy.get("[data-cy=addRepo]").click();
cy.wait("@getRepos").its("response.statusCode").should("eq", 200);
cy.get("[data-cy=listRepo]").contains("ADR-Manager").click();
Expand Down
6 changes: 3 additions & 3 deletions cypress/e2e/adrManagerTest/AddRepo.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ context("Listing and adding repositories", () => {
beforeEach(() => {
window.localStorage.clear();
window.localStorage.setItem("authId", Cypress.env("OAUTH_E2E_AUTH_ID"));
window.localStorage.setItem("user", Cypress.env("USER"))
window.localStorage.setItem("user", Cypress.env("USER"));
cy.visit(TEST_BASE_URL);
cy.intercept('GET', REST_LIST_REPO_URL).as("getRepos");
cy.intercept("GET", REST_LIST_REPO_URL).as("getRepos");
cy.get("[data-cy=addRepo]").click();
cy.wait("@getRepos").its("response.statusCode").should("eq", 200);
});
Expand Down Expand Up @@ -35,4 +35,4 @@ context("Listing and adding repositories", () => {
cy.get("[data-cy=repoNameList]").children().should("have.length", numberOfAddedRepositories);
});
});
});
});
6 changes: 3 additions & 3 deletions cypress/e2e/adrManagerTest/DeleteAdr.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ context("Deleting an ADR from a repo", () => {
it("Remove one ADR", () => {
window.localStorage.clear();
window.localStorage.setItem("authId", Cypress.env("OAUTH_E2E_AUTH_ID"));
window.localStorage.setItem("user", Cypress.env("USER"))
window.localStorage.setItem("user", Cypress.env("USER"));
cy.visit(TEST_BASE_URL);
// add the ADR-Manager repo
cy.intercept('GET', REST_LIST_REPO_URL).as("getRepos");
cy.intercept("GET", REST_LIST_REPO_URL).as("getRepos");

cy.get("[data-cy=addRepo]").click();
cy.wait("@getRepos").its("response.statusCode").should("eq", 200);
Expand All @@ -29,6 +29,6 @@ context("Deleting an ADR from a repo", () => {
expect(addedRepos[0].adrs.length).to.eq(adrCount - 1);
expect(addedRepos[0].deletedAdrs.length).to.eq(1);
});
})
});
});
});
4 changes: 2 additions & 2 deletions cypress/e2e/adrManagerTest/DeleteRepo.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ context("Deleting repositories", () => {
it("Remove a repo", () => {
window.localStorage.clear();
window.localStorage.setItem("authId", Cypress.env("OAUTH_E2E_AUTH_ID"));
window.localStorage.setItem("user", Cypress.env("USER"))
window.localStorage.setItem("user", Cypress.env("USER"));
cy.visit(TEST_BASE_URL);
// add ADR Manager repo
cy.intercept('GET', REST_LIST_REPO_URL).as("getRepos");
cy.intercept("GET", REST_LIST_REPO_URL).as("getRepos");
cy.get("[data-cy=addRepo]").click();
cy.wait("@getRepos").its("response.statusCode").should("eq", 200);
cy.get("[data-cy=listRepo]").contains("ADR-Manager").click();
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/adrManagerTest/Modes.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ context("Using editor modes", () => {
it("Switch to professional mode and create a new ADR", () => {
window.localStorage.clear();
window.localStorage.setItem("authId", Cypress.env("OAUTH_E2E_AUTH_ID"));
window.localStorage.setItem("user", Cypress.env("USER"))
window.localStorage.setItem("user", Cypress.env("USER"));
cy.visit(TEST_BASE_URL);

// add ADR Manager repo
cy.intercept('GET', REST_LIST_REPO_URL).as("getRepos");
cy.intercept("GET", REST_LIST_REPO_URL).as("getRepos");
cy.get("[data-cy=addRepo]").click();
cy.wait("@getRepos").its("response.statusCode").should("eq", 200);
cy.get("[data-cy=listRepo]").contains("ADR-Manager").click();
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/adrManagerTest/Parser.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ context("Using Markdown modes", () => {
it("Convert raw Markdown", () => {
window.localStorage.clear();
window.localStorage.setItem("authId", Cypress.env("OAUTH_E2E_AUTH_ID"));
window.localStorage.setItem("user", Cypress.env("USER"))
window.localStorage.setItem("user", Cypress.env("USER"));
cy.visit(TEST_BASE_URL);

// add ADR Manager repo
cy.intercept('GET', REST_LIST_REPO_URL).as("getRepos");
cy.intercept("GET", REST_LIST_REPO_URL).as("getRepos");
cy.get("[data-cy=addRepo]").click();
cy.wait("@getRepos").its("response.statusCode").should("eq", 200);
cy.get("[data-cy=listRepo]").contains("ADR-Manager").click();
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/adrManagerTest/PushNewAdr.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ context("Committing, pushing, and remote-deleting an ADR", () => {
}
window.localStorage.clear();
window.localStorage.setItem("authId", Cypress.env("OAUTH_E2E_AUTH_ID"));
window.localStorage.setItem("user", Cypress.env("USER"))
window.localStorage.setItem("user", Cypress.env("USER"));
cy.visit(TEST_BASE_URL);
addRepositoryAndSwitchBranch();

Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/adrManagerTest/Routing.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ context("Routing and correct URLs", () => {
beforeEach(() => {
window.localStorage.clear();
window.localStorage.setItem("authId", Cypress.env("OAUTH_E2E_AUTH_ID"));
window.localStorage.setItem("user", Cypress.env("USER"))
window.localStorage.setItem("user", Cypress.env("USER"));
cy.visit(TEST_BASE_URL);
});
it("URL corresponds to opened repo and ADR", () => {
cy.url().should("equal", TEST_BASE_URL);

// add the ADR-Manager repo
cy.intercept('GET', REST_LIST_REPO_URL).as("getRepos");
cy.intercept("GET", REST_LIST_REPO_URL).as("getRepos");
cy.get("[data-cy=addRepo]").click();
cy.wait("@getRepos").its("response.statusCode").should("eq", 200);
cy.get("[data-cy=listRepo]").contains("ADR-Manager").click();
Expand Down
10 changes: 4 additions & 6 deletions cypress/support/e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ import "./commands";
// cypress/support/index.js
import "@cypress/code-coverage/support";


export const TEST_BASE_URL = "http://localhost:8000/adr-manager/#/manager";
export const REST_LIST_REPO_URL = "**/user/repos**"
export const REST_REPO_URL = "**/repos/**"
export const REST_BRANCH_URL = "**/repos/**/branches/**"
export const REST_COMMIT_URL = "**/repos/**/git/commits?**"

export const REST_LIST_REPO_URL = "**/user/repos**";
export const REST_REPO_URL = "**/repos/**";
export const REST_BRANCH_URL = "**/repos/**/branches/**";
export const REST_COMMIT_URL = "**/repos/**/git/commits?**";
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<link
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default {
// A map from regular expressions to module names that allow to stub out resources with a single module
moduleNameMapper: {
vue$: "vue/dist/vue.common.js",
"^@/(.*)$": "<rootDir>/src/$1",
"^@/(.*)$": "<rootDir>/src/$1"
},
// The test environment that will be used for testing
testEnvironment: "node",
Expand Down
Loading

0 comments on commit b122384

Please sign in to comment.