Skip to content

Commit

Permalink
πŸ— Move automated test fixtures from manual to fixtures/e2e (#32178)
Browse files Browse the repository at this point in the history
* Move automated test fixtures from manual to fixtures/e2e

* Move e2e fixtures from manual (amp-carousel, amp-lightbox-gallery-launch, amp-story)

* Include test/fixtures/e2e files in PR Deploy/gulp serve

* Add missing trailing slash
  • Loading branch information
rcebulko committed Jan 26, 2021
1 parent 62803a2 commit 8374e45
Show file tree
Hide file tree
Showing 18 changed files with 13 additions and 10 deletions.
3 changes: 2 additions & 1 deletion build-system/pr-check/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ const NOMODULE_OUTPUT_FILE = `amp_nomodule_${ciBuildSha()}.zip`;
const MODULE_OUTPUT_FILE = `amp_module_${ciBuildSha()}.zip`;

const BUILD_OUTPUT_DIRS = 'build/ dist/ dist.3p/';
const APP_SERVING_DIRS = 'dist.tools/ examples/ test/manual/';
const APP_SERVING_DIRS =
'dist.tools/ examples/ test/manual/ texst/fixtures/e2e/';

// TODO(rsimha, ampproject/amp-github-apps#1110): Update storage details.
const GCLOUD_STORAGE_BUCKET = 'gs://amp-travis-builds';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describes.endtoend(
'amp-autocomplete',
{
testUrl:
'http://localhost:8000/test/manual/amp-autocomplete/amp-autocomplete-inline.amp.html',
'http://localhost:8000/test/fixtures/e2e/amp-autocomplete/amp-autocomplete-inline.amp.html',
// TODO: Restore 'environments' to default after supporting fourth test in
// shadow environment.
environments: ['single', 'viewer-demo'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describes.endtoend(
'amp-autocomplete',
{
testUrl:
'http://localhost:8000/test/manual/amp-autocomplete/amp-autocomplete.amp.html',
'http://localhost:8000/test/fixtures/e2e/amp-autocomplete/amp-autocomplete.amp.html',
// TODO: Restore 'environments' to default after supporting fourth test in
// shadow environment.
environments: ['single', 'viewer-demo'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describes.endtoend(
'AMP carousel 0.1 buttons with hidden controls',
{
testUrl:
'http://localhost:8000/test/manual/amp-carousel/0.1/hidden-controls.amp.html',
'http://localhost:8000/test/fixtures/e2e/amp-carousel/0.1/hidden-controls.amp.html',
experiments: ['amp-carousel'],
environments: ['single'],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describes.endtoend(
'AMP carousel 0.2 with responsive slides',
{
testUrl:
'http://localhost:8000/test/manual/amp-carousel/0.2/responsive-slides.amp.html',
'http://localhost:8000/test/fixtures/e2e/amp-carousel/0.2/responsive-slides.amp.html',
experiments: ['amp-carousel'],
environments: ['single'],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describes.endtoend(
'AMP Lightbox Gallery Open/Close',
{
testUrl:
'http://localhost:8000/test/manual/amp-lightbox-gallery-launch.amp.html',
'http://localhost:8000/test/fixtures/e2e/amp-lightbox/amp-lightbox-gallery-launch.amp.html',
initialRect: {width: pageWidth, height: pageHeight},
// TODO(sparhami) Get this working in other environments.
environments: ['single'],
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-list/0.1/test-e2e/test-load-more-auto.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describes.endtoend(
'AMP list load-more=auto',
{
testUrl:
'http://localhost:8000/test/manual/amp-list/load-more-auto.amp.html',
'http://localhost:8000/test/fixtures/e2e/amp-list/load-more-auto.amp.html',
initialRect: {width: pageWidth, height: pageHeight},
// TODO(cathyxz, cvializ): figure out why 'viewer' only shows 'FALLBACK'
// TODO(cathyxz): figure out why shadow-demo doesn't work
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-list/0.1/test-e2e/test-load-more-manual.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describes.endtoend(
'AMP list load-more=manual',
{
testUrl:
'http://localhost:8000/test/manual/amp-list/' +
'http://localhost:8000/test/fixtures/e2e/amp-list/' +
'load-more-manual.amp.html',
initialRect: {width: pageWidth, height: pageHeight},
// TODO(cathyxz, cvializ): figure out why 'viewer-demo' only shows 'FALLBACK'
Expand Down
3 changes: 2 additions & 1 deletion extensions/amp-story/1.0/test-e2e/test-amp-story-bookend.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ import {Key} from '../../../../build-system/tasks/e2e/functional-test-controller
describes.endtoend(
'amp story bookend',
{
testUrl: 'http://localhost:8000/test/manual/amp-story/amp-story.amp.html',
testUrl:
'http://localhost:8000/test/fixtures/e2e/amp-story/amp-story.amp.html',
// TODO(estherkim): implement mobile emulation on Firefox when available on geckodriver
browsers: ['chrome'],
environments: ['single'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ import {Key} from '../../../../build-system/tasks/e2e/functional-test-controller
describes.endtoend(
'amp story share menu',
{
testUrl: 'http://localhost:8000/test/manual/amp-story/amp-story.amp.html',
testUrl:
'http://localhost:8000/test/fixtures/e2e/amp-story/amp-story.amp.html',
browsers: ['chrome'],
environments: ['single'],
deviceName: 'iPhone X',
Expand Down
File renamed without changes.

0 comments on commit 8374e45

Please sign in to comment.