Bug 32258 – Rename fast/websockets to fast/websocket

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Alexey Proskuryakov]

Make it match the root-level websocket directory - I can never remember how each is spelled.

[Alexey Proskuryakov]

On the other hand, maybe I shouldn't be renaming it, given that we're going to forbid creating WebSockets from file:// resources - so it will need to be merged into the root one anyway.

[Fumitoshi Ukai]

Created attachment 47105 [details]
Patch

[Shinichiro Hamaji]

Comment on attachment 47105 [details]
Patch

> diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
> index d63a7d9..50d0689 100644
> --- a/LayoutTests/ChangeLog
> +++ b/LayoutTests/ChangeLog
> @@ -1,3 +1,18 @@
> [phone]  Fumitoshi Ukai  <[e-mail]>
> +
> +        Reviewed by NOBODY (OOPS!).
> +
> +        Move fast/websockets into websocket/tests
> +        https://bugs.webkit.org/show_bug.cgi?id=32258
> +
> +        * fast/websockets/script-tests/TEMPLATE.html: Removed.
> +        * fast/websockets/script-tests/websocket-event-target.js: Removed.
> +        * fast/websockets/websocket-event-target-expected.txt: Removed.
> +        * fast/websockets/websocket-event-target.html: Removed.
> +        * websocket/tests/script-tests/websocket-event-target.js: Added.
> +        * websocket/tests/websocket-event-target-expected.txt: Added.
> +        * websocket/tests/websocket-event-target.html: Added.

I guess you forgot to add TEMPLATE.html ? I'm not sure, but if you used git mv create this patch, prepare-ChangeLog should print "Renamed from ..." instead of "Added" ?

[Fumitoshi Ukai]

(In reply to comment #3)
> (From update of attachment 47105 [details])
> > diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
> > index d63a7d9..50d0689 100644
> > --- a/LayoutTests/ChangeLog
> > +++ b/LayoutTests/ChangeLog
> > @@ -1,3 +1,18 @@
> > [phone]  Fumitoshi Ukai  <[e-mail]>
> > +
> > +        Reviewed by NOBODY (OOPS!).
> > +
> > +        Move fast/websockets into websocket/tests
> > +        https://bugs.webkit.org/show_bug.cgi?id=32258
> > +
> > +        * fast/websockets/script-tests/TEMPLATE.html: Removed.
> > +        * fast/websockets/script-tests/websocket-event-target.js: Removed.
> > +        * fast/websockets/websocket-event-target-expected.txt: Removed.
> > +        * fast/websockets/websocket-event-target.html: Removed.
> > +        * websocket/tests/script-tests/websocket-event-target.js: Added.
> > +        * websocket/tests/websocket-event-target-expected.txt: Added.
> > +        * websocket/tests/websocket-event-target.html: Added.
> 
> I guess you forgot to add TEMPLATE.html ? 

I think TEMPLATE.html already exists in websocket/tests/script-tests/

> I'm not sure, but if you used git mv
> create this patch, prepare-ChangeLog should print "Renamed from ..." instead of
> "Added" ?

Hmm, git status shows "renamed: LayoutTests/fast/websockets/script-tests/websocket-event-target.js -> LayotuTests/websocket/tests/script-tests/websocket-event-target.js" or so, but "webkit-patch prepare" provided the ChangeLog as in attachment.

[Shinichiro Hamaji]

Comment on attachment 47105 [details]
Patch

Thanks for the clarifications!

> > I guess you forgot to add TEMPLATE.html ? 
> 
> I think TEMPLATE.html already exists in websocket/tests/script-tests/

Ah, I see. I didn't notice that. Looks good then.

> Hmm, git status shows "renamed:
> LayoutTests/fast/websockets/script-tests/websocket-event-target.js ->
> LayotuTests/websocket/tests/script-tests/websocket-event-target.js" or so, but
> "webkit-patch prepare" provided the ChangeLog as in attachment.

I guess it's because you changed the content slightly?

[Alexey Proskuryakov]

I doubt that directory rename will be landed correctly from a git checkout; please commit this change using svn to preserve file histories.

[Fumitoshi Ukai]

Committed r53676: <http://trac.webkit.org/changeset/53676>