Skip to content

Commit

Permalink
AMP CICD removal (#13094)
Browse files Browse the repository at this point in the history
Remove AMP from CICD
  • Loading branch information
abeddow91 authored Jan 7, 2025
1 parent 17d98a7 commit 4fff305
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 79 deletions.
26 changes: 0 additions & 26 deletions .github/workflows/amp.yml

This file was deleted.

8 changes: 1 addition & 7 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,12 @@ jobs:
with:
container-image: ${{ needs.container.outputs.container-image }}

amp:
needs: [container]
uses: ./.github/workflows/amp.yml
with:
container-image: ${{ needs.container.outputs.container-image }}

publish:
permissions:
id-token: write
contents: read
pull-requests: write # required by riff-raff action
needs: [container, prettier, jest, lint, playwright, amp]
needs: [container, prettier, jest, lint, playwright]
uses: ./.github/workflows/publish.yml
with:
container-image: ${{ needs.container.outputs.container-image }}
Expand Down
4 changes: 0 additions & 4 deletions dotcom-rendering/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@ playwright-open: clear clean-dist install build
$(call log, "starting DEV server and opening Playwright UI")
@pnpm playwright:open

ampValidation: clean-dist install
$(call log, "starting AMP Validation test")
@node scripts/test/amp-validation.js

buildCheck:
$(call log, "checking build files")
@node ./scripts/test/build-check.js
Expand Down
20 changes: 0 additions & 20 deletions dotcom-rendering/playwright/tests/article.e2e.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,25 +96,5 @@ test.describe('E2E Page rendering', () => {
});
});

test.describe('for AMP', function () {
test(`It should load render an AMP page`, async ({ page }) => {
await loadPage(
page,
`/AMPArticle/https://amp.theguardian.com/commentisfree/2019/oct/16/impostor-syndrome-class-unfairness`,
);

await expect(page.locator('header').first()).toContainText(
'Opinion',
);

// In this AMP Article we'd expect three advert slots to be inserted
// (note each of these slots will itself contain a regional slot, that will only appear in certain geos)
// And each to have the follow IDs
await expect(page.locator('#ad-1')).toBeAttached();
await expect(page.locator('#ad-2')).toBeAttached();
await expect(page.locator('#ad-3')).toBeAttached();
});
});

// TODO e2e add skipped tests from article.e2e.cy.js
});
22 changes: 0 additions & 22 deletions dotcom-rendering/playwright/tests/article.embeds.e2e.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,6 @@ import { loadPage } from '../lib/load-page';
import { expectToBeVisible } from '../lib/locators';

test.describe('Embeds', () => {
test.describe('AMP', () => {
test('should render the corona interactive atom embed', async ({
page,
}) => {
await loadPage(
page,
'/AMPArticle/https://www.theguardian.com/world/2020/apr/24/new-mother-dies-of-coronavirus-six-days-after-giving-birth',
);
await cmpAcceptAll(
page,
'amp-consent > iframe[src*="sourcepoint"]',
);

await expect(
await getIframeBody(
page,
'amp-iframe[data-testid="atom-embed-url"] > iframe',
),
).toContainText('Daily cases');
});
});

test.describe('WEB', function () {
test('should render the click to view overlay revealing the embed when clicked', async ({
page,
Expand Down

0 comments on commit 4fff305

Please sign in to comment.