Skip to content

Commit bb3ca33

Browse files
jaissica12jaissica12
authored
Merge branch 'development' into test/SDKE-306-add-support-for-mobile-browsers
2 parents 0afd2b8 + 8c5749d commit bb3ca33

4 files changed

Lines changed: 170 additions & 5 deletions

File tree

‎.github/workflows/cross-browser-testing-beta.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: 'BrowserStack Beta Browsers Test'
2+
on: [push, workflow_dispatch]
3+
4+
jobs:
5+
browserstack-beta-test:
6+
name: 'BrowserStack Beta Browsers Test'
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: 'BrowserStack Env Setup'
10+
uses: browserstack/github-actions/setup-env@master
11+
with:
12+
username: ${{ secrets.BROWSERSTACK_USERNAME }}
13+
access-key: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
14+
15+
- name: 'BrowserStack Local Tunnel Setup'
16+
uses: browserstack/github-actions/setup-local@master
17+
with:
18+
local-testing: start
19+
local-identifier: random
20+
21+
- name: 'Checkout the repository'
22+
uses: actions/checkout@v3
23+
24+
- name: 'Run NPM CI'
25+
run: npm ci
26+
27+
- name: Run Build IIFE
28+
run: npm run build:iife
29+
30+
- name: 'Run Build test bundle'
31+
run: npm run build:test-bundle
32+
33+
- name: 'Run BrowserStack Beta Browsers Test'
34+
run: npm run test:browserstack-beta
35+
36+
- name: 'BrowserStackLocal Stop'
37+
uses: browserstack/github-actions/setup-local@master
38+
with:
39+
local-testing: stop
40+

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
"test:browserstack-android:debug": "cross-env DEBUG=true karma start test/cross-browser-testing/browserstack.karma.android.config.js",
4848
"test:browserstack-iOS": "karma start test/cross-browser-testing/browserstack.karma.iOS.config.js",
4949
"test:browserstack-iOS:debug": "cross-env DEBUG=true karma start test/cross-browser-testing/browserstack.karma.iOS.config.js",
50+
"test:browserstack-beta": "karma start test/cross-browser-testing/browserstack.karma.beta.config.js",
51+
"test:browserstack-beta:debug": "cross-env DEBUG=true karma start test/cross-browser-testing/browserstack.karma.beta.config.js",
5052
"test:debug": "cross-env DEBUG=true karma start test/karma.config.js",
5153
"test:stub": "cross-env TESTTYPE=stub ENVIRONMENT=prod rollup --config rollup.test.config.js && karma start test/stub/karma.stub.config.js",
5254
"test:integrations": "npm run test:requirejs && npm run test:integrations:cjs && npm run test:integrations:module",

‎src/persistence.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -949,11 +949,7 @@ export default function _Persistence(mpInstance) {
949949
};
950950

951951
this.resetPersistence = function() {
952-
removeLocalStorage(StorageNames.localStorageName);
953-
removeLocalStorage(StorageNames.localStorageNameV3);
954-
removeLocalStorage(StorageNames.localStorageNameV4);
955-
removeLocalStorage(mpInstance._Store.storageName);
956-
removeLocalStorage(StorageNames.localStorageProductsV4);
952+
localStorage.clear();
957953

958954
self.expireCookies(StorageNames.cookieName);
959955
self.expireCookies(StorageNames.cookieNameV2);

‎test/cross-browser-testing/browserstack.karma.beta.config.js‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
const { DEBUG } = process.env;
2+
3+
const files = [
4+
'../lib/geomock.js',
5+
'../../dist/mparticle.js',
6+
'../test-bundle.js',
7+
];
8+
9+
let captureConsole = false;
10+
let browserConsoleLogOptions = {};
11+
12+
if (DEBUG === 'true') {
13+
browserConsoleLogOptions = {
14+
level: 'log',
15+
format: '%b %T: %m',
16+
terminal: true,
17+
};
18+
captureConsole = true;
19+
} else {
20+
browserConsoleLogOptions = {
21+
terminal: false,
22+
};
23+
}
24+
25+
const customLaunchers = {
26+
bs_chrome_mac_tahoe_beta: {
27+
base: 'BrowserStack',
28+
browser: 'chrome',
29+
browser_version: 'latest-beta',
30+
os: 'OS X',
31+
os_version: 'Tahoe' // macOS 26
32+
},
33+
bs_chrome_mac_sequoia_beta: {
34+
base: 'BrowserStack',
35+
browser: 'chrome',
36+
browser_version: 'latest-beta',
37+
os: 'OS X',
38+
os_version: 'Sequoia' // macOS 15
39+
},
40+
bs_chrome_win_beta: {
41+
base: 'BrowserStack',
42+
browser: 'chrome',
43+
browser_version: 'latest',
44+
os: 'Windows',
45+
os_version: '11'
46+
},
47+
bs_firefox_mac_tahoe_beta: {
48+
base: 'BrowserStack',
49+
browser: 'firefox',
50+
browser_version: 'latest-beta',
51+
os: 'OS X',
52+
os_version: 'Tahoe' // macOS 26
53+
},
54+
bs_firefox_mac_sequoia_beta: {
55+
base: 'BrowserStack',
56+
browser: 'firefox',
57+
browser_version: 'latest-beta',
58+
os: 'OS X',
59+
os_version: 'Sequoia' // macOS 15
60+
},
61+
bs_firefox_mac_catalina_beta: {
62+
base: 'BrowserStack',
63+
browser: 'firefox',
64+
browser_version: 'latest-beta',
65+
os: 'OS X',
66+
os_version: 'Catalina' // macOS 10.15
67+
},
68+
bs_firefox_win_latest: {
69+
base: 'BrowserStack',
70+
browser: 'firefox',
71+
browser_version: 'latest',
72+
os: 'Windows',
73+
os_version: '11',
74+
},
75+
bs_edge_mac_tahoe_beta: {
76+
base: 'BrowserStack',
77+
browser: 'edge',
78+
browser_version: 'latest-beta',
79+
os: 'OS X',
80+
os_version: 'Tahoe' // macOS 26
81+
},
82+
bs_edge_mac_sequoia_beta: {
83+
base: 'BrowserStack',
84+
browser: 'edge',
85+
browser_version: 'latest-beta',
86+
os: 'OS X',
87+
os_version: 'Sequoia' // macOS 15
88+
},
89+
bs_edge_win_beta: {
90+
base: 'BrowserStack',
91+
browser: 'edge',
92+
browser_version: 'latest-beta',
93+
os: 'Windows',
94+
os_version: '11'
95+
},
96+
};
97+
98+
module.exports = function(config) {
99+
config.set({
100+
browserStack: {
101+
username: process.env.BS_USERNAME,
102+
accessKey: process.env.BS_ACCESS_KEY
103+
},
104+
autoWatch: false,
105+
customLaunchers,
106+
browsers: Object.keys(customLaunchers),
107+
frameworks: ['mocha', 'should'],
108+
files,
109+
reporters: ['progress', 'junit'],
110+
colors: true,
111+
singleRun: true,
112+
debug: true,
113+
logLevel: config.LOG_INFO,
114+
browserConsoleLogOptions,
115+
client: {
116+
captureConsole,
117+
},
118+
junitReporter: {
119+
outputDir: 'reports/',
120+
outputFile: 'test-karma-beta.xml',
121+
},
122+
browserDisconnectTimeout: 50000,
123+
browserDisconnectTolerance: 5,
124+
concurrency: 5,
125+
});
126+
};
127+

0 commit comments

Comments
 (0)