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

Fixed Base Email template path + new test for user create #7201

Merged
merged 4 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 0 additions & 16 deletions cypress/e2e/ui/admin/admin.user.password.spec.js

This file was deleted.

33 changes: 33 additions & 0 deletions cypress/e2e/ui/admin/admin.user.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
context("Admin User Password", () => {
it("List System Users", () => {
cy.loginAdmin("UserList.php");
cy.contains("Church Admin");
});

it("Admin Change password", () => {
cy.loginAdmin("v2/user/95/changePassword");
cy.contains("Change Password: Judith Kennedy");
cy.get("#NewPassword1").type("new-user-password");
cy.get("#NewPassword2").type("new-user-password");
cy.get("form:nth-child(2)").submit();
cy.url().should("contains", "v2/user/95/changePassword");
cy.contains("Password Change Successful");
});


it("Create System Users", () => {
cy.loginAdmin("UserList.php");
cy.contains("Peyton Ray").should('not.exist');
cy.visit("PersonView.php?PersonID=25");
cy.contains("Peyton Ray");
cy.contains("Edit User").should('not.exist');
cy.contains("Make User");
cy.visit('UserEditor.php?NewPersonID=25');
cy.contains("User Editor");
cy.get('.TextColumnWithBottomBorder > select').type('skin-yellow');
cy.get('tr:nth-child(14) .btn-primary').click();
cy.url().should('contains', 'UserList.php');
cy.contains("Peyton Ray");

});
});
2 changes: 1 addition & 1 deletion src/ChurchCRM/Emails/BaseEmail.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function __construct(array $toAddresses)
$this->mail->addAddress($email);
}

$loader = new FilesystemLoader('../templates/email');
$loader = new FilesystemLoader(__DIR__ . '/../../templates/email');
$this->twig = new Environment($loader);
}

Expand Down
Loading