1263237 - merge service-worker/resources/test-helpers.js and service-workers/resources/test-helpers.js

Status: RESOLVED FIXED

(Core :: DOM: Service Workers, defect)

Description

[Ben Kelly [:bkelly, not reviewing]]

We currently have two different wpt test-helpers.js files:

  service-worker/resources/test-helpers.js
  service-workers/resources/test-helpers.js

The first is part of the main service worker tests we just moved out of the mozilla dir.  The second is used in the cache tests.

I intend to merge the second script into the first script.

Comment 1

[Ben Kelly [:bkelly, not reviewing]]

Actually, this is easier then that.  The file names are slightly different:

  service-worker/resources/test-helpers.sub.js
  service-workers/resources/test-helpers.js

So we can just move the second file into the other directory.

Comment 2

[Ben Kelly [:bkelly, not reviewing]]

Attachment: Unify scripts in service-worker/resources. r=jgraham

This moves the one test-helpers.js script that was in service-workers/service-workers/resources into the same resources dir with the other service worker tests.  We've been using service-workers/service-worker (no trailing s) instead.

Comment 3

[Ben Kelly [:bkelly, not reviewing]]

Note, the moved file is in the patch, but splinter doesn't show hg renames in its diff tool.

Comment 4

[Ben Kelly [:bkelly, not reviewing]]

Comment on attachment 8739519 [details] [diff] [review]
Unify scripts in service-worker/resources. r=jgraham

I think I should look at this more.  Now that I understand what the .sub.js means, I think the two files could probably be merged.

Comment 5

[Ben Kelly [:bkelly, not reviewing]]

Attachment: Unify scripts in service-worker/resources. r=jgraham

We can just use the newer test-helpers.sub.js AFAICT.

  https://treeherder.mozilla.org/#/jobs?repo=try&revision=1e539ec66a41

Comment 6

[James Graham [:jgraham]]

Comment on attachment 8739797 [details] [diff] [review]
Unify scripts in service-worker/resources. r=jgraham

Review of attachment 8739797 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks!

Comment 7

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/85e27e41f321

Comment 8

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/85e27e41f321