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

RESOLVED FIXED in Firefox 48

Status

()

RESOLVED FIXED
3 years ago
3 years ago

People

(Reporter: bkelly, Assigned: bkelly)

Tracking

Trunk
mozilla48
Points:
---

Firefox Tracking Flags

(firefox48 fixed)

Details

(Whiteboard: btpp-active)

Attachments

(2 attachments)

(Assignee)

Description

3 years ago
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.
(Assignee)

Updated

3 years ago
Assignee: nobody → bkelly
Status: NEW → ASSIGNED
(Assignee)

Comment 1

3 years ago
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.
(Assignee)

Comment 2

3 years ago
Created attachment 8739519 [details] [diff] [review]
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.
Attachment #8739519 - Flags: review?(james)
(Assignee)

Comment 3

3 years ago
Note, the moved file is in the patch, but splinter doesn't show hg renames in its diff tool.
(Assignee)

Comment 4

3 years ago
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.
Attachment #8739519 - Flags: review?(james)
(Assignee)

Comment 5

3 years ago
Created attachment 8739797 [details] [diff] [review]
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
Attachment #8739797 - Flags: review?(james)
Whiteboard: btpp-active
Comment on attachment 8739797 [details] [diff] [review]
Unify scripts in service-worker/resources. r=jgraham

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

Thanks!
Attachment #8739797 - Flags: review?(james) → review+

Comment 8

3 years ago
bugherder
https://hg.mozilla.org/mozilla-central/rev/85e27e41f321
Status: ASSIGNED → RESOLVED
Last Resolved: 3 years ago
status-firefox48: affected → fixed
Resolution: --- → FIXED
Target Milestone: --- → mozilla48
(Assignee)

Updated

3 years ago
Depends on: 1270673
You need to log in before you can comment on or make changes to this bug.