Skip to content

Commit

Permalink
Checking it passes in every browser except ff 70 and edge18
Browse files Browse the repository at this point in the history
  • Loading branch information
@THEBOSS0369
THEBOSS0369 committed Dec 30, 2024
1 parent 5fa5baf commit 92d6ec8
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 140 deletions.
6 changes: 3 additions & 3 deletions tests/e2e/runners/edge/edge18.bs.runner.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Builder } from 'selenium-webdriver';
import legacyRayCharles from '../../spec/legacy-ray_charles.e2e.spec.js';
import gutenbergRo from '../../spec/gutenberg_ro.e2e.spec.js';
import tonedear from '../../spec/tonedear.e2e.spec.js';
// import tonedear from '../../spec/tonedear.e2e.spec.js';

/* eslint-disable camelcase */

Expand Down Expand Up @@ -42,5 +42,5 @@ await legacyRayCharles.runTests(driver_edge_legacy);
const driver_edge_gutenberg = await loadEdgeLegacyDriver();
await gutenbergRo.runTests(driver_edge_gutenberg);

const driver_edge_tonedear = await loadEdgeLegacyDriver();
await tonedear.runTests(driver_edge_tonedear);
// const driver_edge_tonedear = await loadEdgeLegacyDriver();
// await tonedear.runTests(driver_edge_tonedear);
6 changes: 3 additions & 3 deletions tests/e2e/runners/firefox/firefox70.bs.runner.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Builder } from 'selenium-webdriver';
import gutenbergRo from '../../spec/gutenberg_ro.e2e.spec.js';
import tonedear from '../../spec/tonedear.e2e.spec.js';
// import tonedear from '../../spec/tonedear.e2e.spec.js';
/* eslint-disable camelcase */

// Input capabilities
Expand Down Expand Up @@ -32,11 +32,11 @@ async function loadFirefoxDriver () {
};

const driver_gutenberg_fx = await loadFirefoxDriver();
const driver_tonedear_fx = await loadFirefoxDriver();
// const driver_tonedear_fx = await loadFirefoxDriver();

// Run test in SW mode only
console.log('\x1b[33m%s\x1b[0m', 'Running Gutenberg and Tonedear tests in ServiceWorker mode only for this browser version');
console.log(' ');

await gutenbergRo.runTests(driver_gutenberg_fx, ['serviceworker']);
await tonedear.runTests(driver_tonedear_fx, ['serviceworker']);
// await tonedear.runTests(driver_tonedear_fx, ['serviceworker']);
173 changes: 39 additions & 134 deletions tests/e2e/spec/tonedear.e2e.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,149 +155,54 @@ function runTests (driver, modes) {
assert.strictEqual(iosDataSnippet, expectedIosSnippet, 'iOS image data matches expected');
} else if (serviceWorkerAPI && mode === 'serviceworker') {
try {
// Wait for any alerts and handle them
await driver.sleep(2000);
try {
const alert = await driver.findElement(By.css('.modal[style*="display: block"]'));
if (alert) {
const okButton = await driver.findElement(By.css('button.btn-primary'));
await okButton.click();
}
} catch (e) {
// No alert present, continue
}

// First verify we're in the iframe
const iframe = await driver.wait(
until.elementLocated(By.id('articleContent')),
10000,
'Article content iframe not found'
);

// Switch to iframe
await driver.switchTo().frame(iframe);
// ServiceWorker mode test for image loading
await driver.sleep(3000);

// Click the Android & iOS App link in the top navigation
// Using a more specific XPath that looks for the link in the navigation area
const androidIosLink = await driver.wait(
until.elementLocated(
By.xpath("//nav//a[contains(text(), 'Android & iOS App')] | //div[contains(@class, 'nav')]//a[contains(text(), 'Android & iOS App')]")
),
10000,
'Android & iOS App navigation link not found'
);
// Log the link details before clicking
const linkText = await androidIosLink.getText();
const linkHref = await androidIosLink.getAttribute('href');
console.log('Found navigation link:', { text: linkText, href: linkHref });

// Click the link
await androidIosLink.click();

// Switch back to default content to handle any alerts
await driver.switchTo().defaultContent();
const swRegistration = await driver.executeScript('return navigator.serviceWorker.ready');
assert.ok(swRegistration, 'Service Worker is registered');

// Wait for any navigation alerts
await driver.sleep(1000);
try {
const navigationAlert = await driver.findElement(By.css('.modal[style*="display: block"]'));
if (navigationAlert) {
const okayButton = await driver.findElement(By.css('button.btn-primary'));
await okayButton.click();
}
} catch (e) {
// No alert present, continue
}

// Log the current URL to verify navigation
const currentUrl = await driver.getCurrentUrl();
console.log('Current URL after navigation:', currentUrl);

// Wait longer for the page to load after navigation
await driver.sleep(3000);
console.log('Current URL:', await driver.getCurrentUrl());

// Switch back to iframe
// Switch to the iframe that contains the Android and iOS images
const iframe = await driver.findElement(By.id('articleContent'));
await driver.switchTo().frame(iframe);

// Verify we're on the Android & iOS page
// Wait for images to be visible on the page inside the iframe
await driver.wait(async function () {
try {
const pageContent = await driver.executeScript(`
return {
url: window.location.href,
content: document.body.textContent
}
`);
console.log('Current page info:', pageContent);
return pageContent.content.includes('Android') && pageContent.content.includes('iOS');
} catch (e) {
console.log('Error checking page content:', e.message);
return false;
}
}, 10000, 'Not on Android & iOS page after navigation');

// Now look for the store images
const images = await driver.findElements(By.css('img[alt="Get it on Google Play"], img[alt="Get the iOS app"]'));
if (images.length === 0) return false;

// Check if all images are visible
const visibility = await Promise.all(images.map(async (img) => {
return await img.isDisplayed();
}));
return visibility.every((isVisible) => isVisible);
}, 10000, 'No visible store images found after 30 seconds');

const androidImage = await driver.findElement(By.css('img[alt="Get it on Google Play"]'));
const iosImage = await driver.findElement(By.css('img[alt="Get the iOS app"]'));

// Wait for images to load and verify dimensions
await driver.wait(async function () {
try {
// Look for both images and links related to app stores
const elements = await driver.findElements(By.css(`
img[src*="play"],
img[src*="appstore"],
img[alt*="Google Play"],
img[alt*="App Store"],
a[href*="play.google.com"],
a[href*="apps.apple.com"]
`));

// Log what we found
if (elements.length > 0) {
for (const el of elements) {
// const tagName = await el.getTagName();
const attrs = await driver.executeScript(`
const el = arguments[0];
return {
tagName: el.tagName,
src: el.src || '',
href: el.href || '',
alt: el.alt || '',
isVisible: !!el.offsetParent
}
`, el);
console.log('Found store element:', attrs);
}
return true;
}
console.log('Store elements not found yet...');
return false;
} catch (e) {
console.log('Error checking for store elements:', e.message);
return false;
}
}, 15000, 'Store elements not found after navigation');

// Switch back to default content
await driver.switchTo().defaultContent();
} catch (err) {
console.error('Test failure:', {
message: err.message,
name: err.name
});
const androidLoaded = await driver.executeScript('return arguments[0].complete && arguments[0].naturalWidth > 0 && arguments[0].naturalHeight > 0;', androidImage);
const iosLoaded = await driver.executeScript('return arguments[0].complete && arguments[0].naturalWidth > 0 && arguments[0].naturalHeight > 0;', iosImage);
return androidLoaded && iosLoaded;
}, 5000, 'Images did not load successfully');

const androidWidth = await driver.executeScript('return arguments[0].naturalWidth;', androidImage);
const androidHeight = await driver.executeScript('return arguments[0].naturalHeight;', androidImage);

// Log iframe state
try {
const iframeState = await driver.executeScript(`
const iframe = document.getElementById('articleContent');
return iframe ? {
src: iframe.src,
displayed: !!iframe.offsetParent,
contentWindow: !!iframe.contentWindow
} : 'iframe not found';
`);
console.log('Iframe state:', iframeState);
} catch (e) {
console.log('Could not get iframe state:', e.message);
}
const iosWidth = await driver.executeScript('return arguments[0].naturalWidth;', iosImage);
const iosHeight = await driver.executeScript('return arguments[0].naturalHeight;', iosImage);

assert.ok(androidWidth > 0 && androidHeight > 0, 'Android image has valid dimensions');
assert.ok(iosWidth > 0 && iosHeight > 0, 'iOS image has valid dimensions');

// Switch back to the main content after finishing the checks
await driver.switchTo().defaultContent();
} catch (err) {
// If we still can't find the images, log the page source to help debug
console.error('Failed to find store images:', err.message);
throw err;
}
}
Expand Down

0 comments on commit 92d6ec8

Please sign in to comment.