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

Merge pull request #2461 from Safelite/feature/CASH-188

Browse source 
CASH-188 | Change way current env is determined
This commit is contained in:
scottkiener-at-safelite 2025-04-28 09:51:06 -04:00 committed by GitHub
commit a7bab926c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/digital-components/salesforce-webchat/salesforce-helper-qa.js
View file

@ -52,7 +52,6 @@ export function initializeSalesforceWebchatForQa() {
}; };
if (!window.embedded_svc) { if (!window.embedded_svc) {
console.log("no embedded svc found");
var s = document.createElement("script"); var s = document.createElement("script");
s.setAttribute( s.setAttribute(
"src", "src",
@ -63,7 +62,6 @@ export function initializeSalesforceWebchatForQa() {
}; };
document.body.appendChild(s); document.body.appendChild(s);
} else { } else {
console.log("embedded svc found");
initESW("https://service.force.com"); initESW("https://service.force.com");
} }
} }

7
src/digital-components/salesforce-webchat/salesforce-webchat.spec.js
View file

@ -3,6 +3,7 @@ import salesforceWebchat from "./salesforce-webchat.vue";
import * as devHelper from "./salesforce-helper-dev"; import * as devHelper from "./salesforce-helper-dev";
import * as qaHelper from "./salesforce-helper-qa"; import * as qaHelper from "./salesforce-helper-qa";
import * as prodHelper from "./salesforce-helper-prod"; import * as prodHelper from "./salesforce-helper-prod";
import { applicationConfig } from "../../constants/application-config";
describe("salesforceWebchat.vue", () => { describe("salesforceWebchat.vue", () => {
it("renders correctly", () => { it("renders correctly", () => {
@ -21,19 +22,19 @@ describe("salesforceWebchat.vue", () => {
}); });
it("calls the correct initialization function based on environment", () => { it("calls the correct initialization function based on environment", () => {
process.env.VUE_APP_CURRENT_ENVIRONMENT = "Prod"; applicationConfig.CURRENT_ENVIRONMENT = "Prod";
let wrapper = shallowMount(salesforceWebchat); let wrapper = shallowMount(salesforceWebchat);
mockProd = jest.spyOn(prodHelper, "initializeSalesforceWebchatForProd"); mockProd = jest.spyOn(prodHelper, "initializeSalesforceWebchatForProd");
wrapper.vm.initializeSalesforceWebchat(); wrapper.vm.initializeSalesforceWebchat();
expect(mockProd).toHaveBeenCalled(); expect(mockProd).toHaveBeenCalled();
process.env.VUE_APP_CURRENT_ENVIRONMENT = "QA"; applicationConfig.CURRENT_ENVIRONMENT = "QA";
wrapper = shallowMount(salesforceWebchat); wrapper = shallowMount(salesforceWebchat);
mockQa = jest.spyOn(qaHelper, "initializeSalesforceWebchatForQa"); mockQa = jest.spyOn(qaHelper, "initializeSalesforceWebchatForQa");
wrapper.vm.initializeSalesforceWebchat(); wrapper.vm.initializeSalesforceWebchat();
expect(mockQa).toHaveBeenCalled(); expect(mockQa).toHaveBeenCalled();
process.env.VUE_APP_CURRENT_ENVIRONMENT = "Dev"; applicationConfig.CURRENT_ENVIRONMENT = "Dev";
wrapper = shallowMount(salesforceWebchat); wrapper = shallowMount(salesforceWebchat);
mockDev = jest.spyOn(devHelper, "initializeSalesforceWebchatForDev"); mockDev = jest.spyOn(devHelper, "initializeSalesforceWebchatForDev");
wrapper.vm.initializeSalesforceWebchat(); wrapper.vm.initializeSalesforceWebchat();

10
src/digital-components/salesforce-webchat/salesforce-webchat.vue
View file

@ -7,6 +7,7 @@
import { initializeSalesforceWebchatForDev } from "./salesforce-helper-dev"; import { initializeSalesforceWebchatForDev } from "./salesforce-helper-dev";
import { initializeSalesforceWebchatForQa } from "./salesforce-helper-qa"; import { initializeSalesforceWebchatForQa } from "./salesforce-helper-qa";
import { initializeSalesforceWebchatForProd } from "./salesforce-helper-prod"; import { initializeSalesforceWebchatForProd } from "./salesforce-helper-prod";
import { applicationConfig } from "@/constants/application-config";
export default { export default {
name: "salesforceWebchat", name: "salesforceWebchat",
@ -28,23 +29,16 @@ export default {
}, },
methods: { methods: {
initializeSalesforceWebchat() { initializeSalesforceWebchat() {
console.log( switch (applicationConfig.CURRENT_ENVIRONMENT) {
"process.env.VUE_APP_CURRENT_ENVIRONMENT",
process.env.VUE_APP_CURRENT_ENVIRONMENT
);
switch (process.env.VUE_APP_CURRENT_ENVIRONMENT) {
case "Prod": case "Prod":
console.log("Prod");
initializeSalesforceWebchatForProd(); initializeSalesforceWebchatForProd();
break; break;
case "QA": case "QA":
case "SysTest": case "SysTest":
console.log("QA");
initializeSalesforceWebchatForQa(); initializeSalesforceWebchatForQa();
break; break;
case "Dev": case "Dev":
case "Localhost": case "Localhost":
console.log("Dev");
initializeSalesforceWebchatForDev(); initializeSalesforceWebchatForDev();
break; break;
} }