Changeset 237876 in webkit


Ignore:
Timestamp:
Nov 6, 2018 11:03:45 AM (5 years ago)
Author:
achristensen@apple.com
Message:

Fix tests after r237863
​https://bugs.webkit.org/show_bug.cgi?id=191315

Reviewed by Chris Dumez.

Tools:

  • TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:

With the timing change of r237863, the WKWebView progressed further than before when loading main.html so it completed before main2.html.
This test was meant to test that main2.html does eventually load, and it doesn't matter if main.html loads before it. I updated the test
to verify that main2.html eventually loads, making this test less timing dependent.

LayoutTests:

  • platform/mac-wk2/http/tests/navigation: Added.
  • platform/mac-wk2/http/tests/navigation/keyboard-events-during-provisional-navigation-expected.txt: Copied from LayoutTests/http/tests/navigation/keyboard-events-during-provisional-navigation-expected.txt.

This test is timing related, and I need to update its WK2 expectations every time I enable or disable safe browsing checks during navigation.
See r237149.

Location:
trunk
Files:
1 added
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r237870 r237876  
     12018-11-06  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix tests after r237863
     4        https://bugs.webkit.org/show_bug.cgi?id=191315
     5
     6        Reviewed by Chris Dumez.
     7
     8        * platform/mac-wk2/http/tests/navigation: Added.
     9        * platform/mac-wk2/http/tests/navigation/keyboard-events-during-provisional-navigation-expected.txt: Copied from LayoutTests/http/tests/navigation/keyboard-events-during-provisional-navigation-expected.txt.
     10        This test is timing related, and I need to update its WK2 expectations every time I enable or disable safe browsing checks during navigation.
     11        See r237149.
     12
    1132018-11-06  Ryan Haddad  <ryanhaddad@apple.com>
    214

  • trunk/LayoutTests/platform/mac-wk2/http/tests/navigation/keyboard-events-during-provisional-navigation-expected.txt

    r237863 r237876  
    1111CONSOLE MESSAGE: line 58: Input element value after text input events: "".
    1212CONSOLE MESSAGE: line 20: Pressing "z" with access key modifiers should navigate to resources/keyboard-events-after-navigation.html.
     13CONSOLE MESSAGE: line 18: keydownevent dispatched (isTrusted: true).
     14CONSOLE MESSAGE: line 18: keyupevent dispatched (isTrusted: true).
    1315CONSOLE MESSAGE: line 6: Finished navigating to resources/keyboard-events-after-navigation.html.
    1416CONSOLE MESSAGE: line 7: Trusted events should be logged and the input element should have the value "acd".

  • trunk/Tools/ChangeLog

    r237870 r237876  
     12018-11-06  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix tests after r237863
     4        https://bugs.webkit.org/show_bug.cgi?id=191315
     5
     6        Reviewed by Chris Dumez.
     7
     8        * TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:
     9        With the timing change of r237863, the WKWebView progressed further than before when loading main.html so it completed before main2.html.
     10        This test was meant to test that main2.html does eventually load, and it doesn't matter if main.html loads before it.  I updated the test
     11        to verify that main2.html eventually loads, making this test less timing dependent.
     12
    1132018-11-06  Ryan Haddad  <ryanhaddad@apple.com>
    214

  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm

    r237830 r237876  
    479479    [webView loadRequest:request];
    480480
    481     TestWebKitAPI::Util::run(&done);
    482     done = false;
    483 
    484     // Should navigate to pson://www.webkit.org/main2.html and not pson://www.apple.com/main.html.
    485     EXPECT_WK_STREQ(@"pson://www.webkit.org/main2.html", [[webView URL] absoluteString]);
     481    while (![[[webView URL] absoluteString] isEqualToString:@"pson://www.webkit.org/main2.html"])
     482        TestWebKitAPI::Util::spinRunLoop();
    486483}
    487484
Note: See TracChangeset for help on using the changeset viewer.