diff options
| author | Manolo Carrasco <manolo@apache.org> | 2015-01-02 16:04:22 +0100 |
|---|---|---|
| committer | Manolo Carrasco <manolo@apache.org> | 2015-01-02 16:04:22 +0100 |
| commit | a431b0ea98ee2ccfa9cbf894cc2fff298b95e1c0 (patch) | |
| tree | 448945881f891087921b3068488e6e1642643559 /gwtquery-core/src | |
| parent | 236235ceca02fcdcbab8be5e7cb2081fede04fda (diff) | |
| parent | 82c7f0d7d8c63c01f382e78d460e229644a9089f (diff) | |
| download | gwtquery-a431b0ea98ee2ccfa9cbf894cc2fff298b95e1c0.tar.gz gwtquery-a431b0ea98ee2ccfa9cbf894cc2fff298b95e1c0.zip | |
Merge branch 'master' into mcm_special_events
Diffstat (limited to 'gwtquery-core/src')
| -rw-r--r-- | gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java | 4 | ||||
| -rw-r--r-- | gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTestGwt.java | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java index 72beed5b..eea88ce4 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java @@ -130,12 +130,12 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> { /** * A Browser object with a set of browser-specific flags. */ - public static final Browser browser = GWT.isClient() ? GWT.<Browser> create(Browser.class) : null; + public static final Browser browser = GWT.isClient() ? GWT.<Browser>create(Browser.class) : null; /** * An object with the same methods than window.console. */ - public static final Console console = GWT.isClient() ? GWT.<Console> create(Console.class) : null; + public static final Console console = GWT.isClient() ? GWT.<Console>create(Console.class) : null; /** * Object to store element data (public so as we can access to it from tests). diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTestGwt.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTestGwt.java index f08c9f80..da19afb1 100644 --- a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTestGwt.java +++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTestGwt.java @@ -118,8 +118,9 @@ public class GQueryEffectsTestGwt extends GWTTestCase { assertEquals(1, back.size()); } - // FIXME: timer 3 fails in real browsers (chrome) - @DoNotRunWith(Platform.Prod) + // Fails in TC windows, pass in Jenkins Linux + // FIXME: Also timer 3 fails in real browsers (chrome). + @DoNotRunWith(Platform.HtmlUnitLayout) public void testEffectsShouldBeQueued() { $(e).html("<p id='idtest'>Content 1</p></p>"); @@ -166,6 +167,8 @@ public class GQueryEffectsTestGwt extends GWTTestCase { timer4.schedule(duration/2); } + // Fails in TC windows, pass in Jenkins Linux + @DoNotRunWith(Platform.HtmlUnitLayout) public void testFade() { $(e) .html( |