jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3147 from Safelite/rlsmerge/2026.04.23-to-dev

Browse source 
Rlsmerge/2026.04.23 to dev
This commit is contained in:
matthew-sykes 2026-04-20 10:55:02 -04:00 committed by GitHub
commit 841853d346
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
src/layouts/payment-adyen/payment-adyen.spec.js
View file

@ -187,118 +187,6 @@ describe("payment-adyen.vue", () => {
expect(result).toBe(true);
});
});
describe("splitStreetAddress", () => {
const setInShopStreet = (streetAddress) => {
store.getters.order.serviceLocation.appointmentType = AppointmentTypeStrings.IN_SHOP;
store.getters.order.serviceLocation.provider.address.streetAddress = streetAddress;
};
test("splits typical address into first token as number and remainder as street", () => {
setInShopStreet("123 West Elm St");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "123",
street: "West Elm St",
});
});
test("two tokens: number and single-word street", () => {
setInShopStreet("456 Oak");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "456",
street: "Oak",
});
});
test("single token with no spaces: full string in number, empty street", () => {
setInShopStreet("123OakStreet");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "123OakStreet",
street: "",
});
});
test("collapses multiple spaces between words", () => {
setInShopStreet("123 West Elm St");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "123",
street: "West Elm St",
});
});
test("trims leading and trailing whitespace on full address", () => {
setInShopStreet(" 99 Maple Ave ");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "99",
street: "Maple Ave",
});
});
test("empty string yields empty number and street", () => {
setInShopStreet("");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "",
street: "",
});
});
test("whitespace-only address yields empty number and street", () => {
setInShopStreet(" \t ");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "",
street: "",
});
});
test("null address yields empty number and street", () => {
setInShopStreet(null);
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "",
street: "",
});
});
test("uses mobile service address when appointment is mobile", () => {
store.getters.order.serviceLocation.appointmentType = AppointmentTypeStrings.MOBILE;
store.getters.order.serviceLocation.address = "700 Broadway Blvd";
store.getters.order.serviceLocation.city = "Columbus";
store.getters.order.serviceLocation.state = "OH";
store.getters.order.serviceLocation.zipCode = "43235";
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "700",
street: "Broadway Blvd",
});
});
test("splits on tabs and other whitespace runs", () => {
setInShopStreet("10\tPine\tLane");
const wrapper = setupMocks({});
expect(wrapper.vm.splitStreetAddress).toEqual({
number: "10",
street: "Pine Lane",
});
});
});
});
function setupMocks({ customMountOptions } = {}) {

16
src/layouts/payment-adyen/payment-adyen.vue
View file

@ -455,8 +455,8 @@ export default {
zipCodeCtu: this.locationInfo.zipCodeCtu,
amount: this.adyenPriceTotal,
city: this.locationInfo.city,
houseNumberOrName: this.splitStreetAddress.number,
street: this.splitStreetAddress.street,
street: this.locationInfo.address ?? "",
houseNumberOrName: this.locationInfo.address2 ?? "",
zipCode: this.locationInfo.zipCode,
stateOrProvince: this.locationInfo.state,
returnUrl: applicationConfig.PIA_ADYEN_RETURN_URL,
@ -515,18 +515,6 @@ export default {
}
},
splitStreetAddress() {
const address = (this.locationInfo?.address ?? "").trim();
const tokens = address.length ? address.split(/\s+/) : [""];
const number = tokens[0] ?? "";
const street = tokens.length > 1 ? tokens.slice(1).join(" ") : "";
return {
number,
street,
};
},
sourceSystem() {
return "FMG-2.0";
},