Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: apache/groovy-geb
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.3.1
Choose a base ref
...
head repository: apache/groovy-geb
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.0
Choose a head ref
3 contributors

Commits on May 23, 2017

  1. Update to groovy 2.5.0-alpha-1

    @erdi
    erdi committed May 23, 2017
    Copy the full SHA
    4c74f62 View commit details

  2. Merge branch 'master' into groovy-2.5

    @erdi
    erdi committed May 23, 2017
    Copy the full SHA
    0104b05 View commit details

  3. Merge branch 'master' into groovy-2.5

    @erdi
    erdi committed May 23, 2017
    Copy the full SHA
    a5f9a48 View commit details

Commits on Jun 18, 2017

  1. Merge branch 'master' into groovy-2.5

    @erdi
    erdi committed Jun 18, 2017
    Copy the full SHA
    c77a482 View commit details

Commits on Jun 28, 2017

  1. Merge branch 'master' into groovy-2.5

    @erdi
    erdi committed Jun 28, 2017
    Copy the full SHA
    d71fd5f View commit details

  2. Update to groovy 2.5.0-beta-1

    @erdi
    erdi committed Jun 28, 2017
    Copy the full SHA
    d472f73 View commit details

Commits on Oct 8, 2017

  1. Merge branch 'master' into groovy-2.5 

    # Conflicts:
#	geb.gradle
    @erdi
    erdi committed Oct 8, 2017
    Copy the full SHA
    56869eb View commit details

  2. Update to Groovy 2.5.0-beta-2

    @erdi
    erdi committed Oct 8, 2017
    Copy the full SHA
    6a96d8d View commit details

  3. Merge branch 'master' into groovy-2.5

    @erdi
    erdi committed Oct 8, 2017
    Copy the full SHA
    e3ba844 View commit details

  4. Do not run publishing tasks when building PRs

    @erdi
    erdi committed Oct 8, 2017
    Copy the full SHA
    bce6e34 View commit details

  5. Merge branch 'master' into groovy-2.5

    @erdi
    erdi committed Oct 8, 2017
    Copy the full SHA
    543e225 View commit details

  6. Merge branch 'master' into groovy-2.5

    @erdi
    erdi committed Oct 8, 2017
    Copy the full SHA
    5417575 View commit details

Commits on Apr 9, 2018

  1. Merge branch 'master' into groovy-2.5

    @erdi
    erdi committed Apr 9, 2018
    Copy the full SHA
    5ce7c16 View commit details

Commits on May 8, 2018

  1. Update to Groovy 2.5.0-rc-2

    @erdi
    erdi committed May 8, 2018
    Copy the full SHA
    1a0a25c View commit details

  2. Merge branch 'master' into groovy-2.5

    @erdi
    erdi committed May 8, 2018
    Copy the full SHA
    0c4a3d7 View commit details

Commits on Jun 13, 2018

  1. Merge branch 'master' into groovy-2.5

    @erdi
    erdi committed Jun 13, 2018
    Copy the full SHA
    a7f22c4 View commit details

  2. Update to Groovy 2.5.0 final.

    @erdi
    erdi committed Jun 13, 2018
    Copy the full SHA
    755a8d2 View commit details

Commits on Dec 22, 2018

  1. Update TestNG

    @erdi
    erdi committed Dec 22, 2018
    Copy the full SHA
    1b654ed View commit details

  2. Update Groovy to 2.5.4

    @erdi
    erdi committed Dec 22, 2018
    Copy the full SHA
    6095ee4 View commit details

  3. Merge remote-tracking branch 'origin/master' into groovy-2.5

    @erdi
    erdi committed Dec 22, 2018
    Copy the full SHA
    c036fb8 View commit details

  4. Avoid manually delegating all $() methods from Page to NavigableSupport

    @erdi
    erdi committed Dec 22, 2018
    Copy the full SHA
    6520f55 View commit details

Commits on Dec 23, 2018

  1. Merge branch 'master' into groovy-2.5

    @erdi
    erdi committed Dec 23, 2018
    Copy the full SHA
    b283454 View commit details

Commits on Feb 2, 2019

  1. Begin next version

    @erdi
    erdi committed Feb 2, 2019
    Copy the full SHA
    0c1270b View commit details

Commits on Feb 3, 2019

  1. Merge branch 'master' into groovy-2.5

    @erdi
    erdi committed Feb 3, 2019
    Copy the full SHA
    77c6c69 View commit details

Commits on Mar 22, 2019

  1. Use Number instead of Double in Wait 

    There is no reason to restrict timeout and interval to Double values.
In the documentation there never was any example using Double, but
Integer (e.g. 5) or Float (e.g. 0.1). While the calls actually worked
due to Groovy's dynamic typing, they cause errors when using strict
typing and cause irritations in Idea, which cannot find the right
method and assumes that waitFor will return Object instead of the return
type of the given Closure.

Switching to Number allows to use any Number type and will solve these
issues.

Contributes to geb/issues#570
    Michael Kutz committed Mar 22, 2019
    Copy the full SHA
    e5cb950 View commit details

Commits on Apr 1, 2019

  1. Make Wait.toMilliseconds return int 

    This saves some formally necessary casts and additional calculations.

Contributes to geb/issues#570
    Michael Kutz committed Apr 1, 2019
    Copy the full SHA
    19f9edc View commit details

  2. Merge pull request #148 from mkutz/master 

    Use Number instead of Double in Wait
    @erdi
    erdi authored Apr 1, 2019
    Copy the full SHA
    e3fcd41 View commit details

Commits on Apr 4, 2019

  1. Remove unnecessary cast

    @erdi
    erdi committed Apr 4, 2019
    Copy the full SHA
    088b8fc View commit details

  2. Remove unused methods

    @erdi
    erdi committed Apr 4, 2019
    Copy the full SHA
    59fa192 View commit details

  3. Change the type of the field holding context elements in navigators t… 

    …o Iterable as it allows for lazy evaluation in preparation for supporting dynamic navigators

Part of geb/issues#557
    @erdi
    erdi committed Apr 4, 2019
    Copy the full SHA
    81da554 View commit details

  4. Remove EmptyNavigator and AbstractNavigator, rename NonEmptyNavigator… 

    … to DefaultNavigator in preparation for supporting dynamic navigators

Part of geb/issues#557
    @erdi
    erdi committed Apr 4, 2019
    Copy the full SHA
    6512584 View commit details

  5. Update webdriver-binaries plugin

    @erdi
    erdi committed Apr 4, 2019
    Copy the full SHA
    a027c2f View commit details

  6. Use NavigatorFactory instead of directly instantiating a navigator in… 

    …stance

Part of geb/issues#557
    @erdi
    erdi committed Apr 4, 2019
    Copy the full SHA
    79a6449 View commit details

  7. Change the type of the field holding context elements in InnerNavigat… 

    …orFactory to Iterable as it allows for lazy evaluation in preparation for supporting dynamic navigators

Part of geb/issues#557
    @erdi
    erdi committed Apr 4, 2019
    Copy the full SHA
    d87008e View commit details

  8. Do not consume the iterable with context elements in AbstractNavigato… 

    …rFactory to allow for lazy evaluation in preparation for supporting dynamic navigators

Part of geb/issues#557
    @erdi
    erdi committed Apr 4, 2019
    Copy the full SHA
    8893619 View commit details

Commits on Apr 12, 2019

  1. Remove @RequiresRealBrowser 

    Since https://sourceforge.net/p/htmlunit/bugs/1923/ is now closed, this
test now works with HtmlUnit.
    Michael Kutz committed Apr 12, 2019
    Copy the full SHA
    faf0755 View commit details

  2. Add support for dynamic navigators created using a css selector 

    Part of geb/issues#557
    @erdi
    erdi committed Apr 12, 2019
    Copy the full SHA
    2dd0489 View commit details

  3. Increase timeout to get a tests passing on AppVeyor again

    @erdi
    erdi committed Apr 12, 2019
    Copy the full SHA
    4bb6e6c View commit details

  4. Update webdriver-binaries-gradle-plugin

    @erdi
    erdi committed Apr 12, 2019
    Copy the full SHA
    6ec526d View commit details

  5. Simplify a test

    @erdi
    erdi committed Apr 12, 2019
    Copy the full SHA
    7ecee61 View commit details

  6. Ensure that the dynamic attribute used when constructing Navigators i… 

    …s interpreted using Groovy truth regardless of type and is not interfering with attributes used for selecting elements

Part of geb/issues#557
    @erdi
    erdi committed Apr 12, 2019
    Copy the full SHA
    66d9333 View commit details

  7. Merge pull request #149 from mkutz/master 

    Remove @RequiresRealBrowser
    @erdi
    erdi authored Apr 12, 2019
    Copy the full SHA
    747d37d View commit details

  8. Fix CodeNarc violation

    @erdi
    erdi committed Apr 12, 2019
    Copy the full SHA
    c6aa069 View commit details

  9. Fix typo in constant name

    @erdi
    erdi committed Apr 12, 2019
    Copy the full SHA
    bf78710 View commit details

  10. Add a test for attribute based dynamic navigators 

    Part of geb/issues#557
    @erdi
    erdi committed Apr 12, 2019
    Copy the full SHA
    44ef656 View commit details

  11. Fix a call to a non-existing method which happened to work because al… 

    …l instances were created using child classes which added the method in question.
    @erdi
    erdi committed Apr 12, 2019
    Copy the full SHA
    65d2412 View commit details

  12. Add support for dynamic navigators created using a css selector and i… 

    …ndex

Part of geb/issues#557
    @erdi
    erdi committed Apr 12, 2019
    Copy the full SHA
    be70a4a View commit details

Commits on Apr 22, 2019

  1. Remove unused method

    @erdi
    erdi committed Apr 22, 2019
    Copy the full SHA
    a94477d View commit details

  2. Remove unused class

    @erdi
    erdi committed Apr 22, 2019
    Copy the full SHA
    d4de853 View commit details

Commits on Apr 23, 2019

  1. Switch tests for manual snippets that require a real browser from usi… 

    …ng a local Firefox to Chrome running in a docker container managed using testcontainers in preparation for moving some of the cross browser tests to run in docker containers as well.
    @erdi
    erdi committed Apr 23, 2019
    Copy the full SHA
    ea724f2 View commit details
Showing with 3,880 additions and 3,020 deletions.
  1. +37 −41 .circleci/config.yml
  2. +0 −16 compatibility/groovy-2.3.7/groovy-2.3.7.gradle
  3. +0 −11 compatibility/spock-1.0/spock-1.0.gradle
  4. +0 −92 ...ility/spock-1.0/src/test/groovy/geb/transform/implicitassertions/Spock1Dot0IntegrationSpec.groovy
  5. +0 −18 compatibility/spock-1.0/src/test/resources/ExampleSpec2.text
  6. +1 −0 doc/manual-snippets/manual-snippets.gradle
  7. +0 −9 doc/manual-snippets/src/realBrowserTest/groovy/intro/ScriptingSpec.groovy
  8. +150 −0 doc/manual-snippets/src/realBrowserTest/groovy/navigator/DynamicModuleBaseSpec.groovy
  9. +3 −2 doc/manual-snippets/src/realBrowserTest/groovy/navigator/NonCharacterKeystrokesSpec.groovy
  10. +23 −1 doc/manual-snippets/src/realBrowserTest/resources/GebConfig.groovy
  11. +6 −0 doc/manual-snippets/src/realBrowserTest/resources/vue-2.6.10.min.js
  12. +3 −3 doc/manual-snippets/src/test/groovy/assertions/ImplicitAssertionsSpec.groovy
  13. +4 −11 doc/manual-snippets/src/test/groovy/configuration/NavigatorFactoryConfigSpec.groovy
  14. +2 −2 doc/manual-snippets/src/test/groovy/configuration/ReportOnTestFailuresConfigSpec.groovy
  15. +1 −1 doc/manual-snippets/src/test/groovy/downloading/UntrustedCertificatesSpec.groovy
  16. +17 −19 ...patibilitySpec.groovy → doc/manual-snippets/src/test/groovy/navigator/DynamicNavigatorSpec.groovy
  17. +3 −3 doc/manual-snippets/src/test/groovy/pages/TemplateOptionsSpec.groovy
  18. +5 −8 doc/manual-snippets/src/test/groovy/testing/FunctionalSpec.groovy
  19. +52 −44 doc/manual-snippets/src/test/groovy/testing/ReportingFunctionalSpec.groovy
  20. +1 −1 doc/manual/src/docs/asciidoc/010-intro.adoc
  21. +90 −4 doc/manual/src/docs/asciidoc/030-navigator.adoc
  22. +1 −1 doc/manual/src/docs/asciidoc/050-modules.adoc
  23. +8 −3 doc/manual/src/docs/asciidoc/060-configuration.adoc
  24. +10 −11 doc/manual/src/docs/asciidoc/110-testing.adoc
  25. +35 −12 doc/manual/src/docs/asciidoc/111-cloud-browsers.adoc
  26. +29 −0 doc/manual/src/docs/asciidoc/140-project.adoc
  27. +2 −1 doc/manual/src/docs/asciidoc/_links.adoc
  28. +1 −1 doc/site/site.gradle
  29. +18 −37 geb.gradle
  30. +2 −2 gradle/codenarc/rulesets.groovy
  31. +1 −1 gradle/wrapper/gradle-wrapper.properties
  32. +0 −25 integration/geb-gradle/src/main/groovy/geb/gradle/browserstack/BrowserStackAccount.groovy
  33. +9 −0 integration/geb-gradle/src/main/groovy/geb/gradle/browserstack/BrowserStackExtension.groovy
  34. +36 −0 integration/geb-gradle/src/main/groovy/geb/gradle/browserstack/BrowserStackLocal.groovy
  35. +12 −11 integration/geb-gradle/src/main/groovy/geb/gradle/browserstack/BrowserStackTunnel.groovy
  36. +56 −1 internal/test-support/src/main/groovy/GebConfig.groovy
  37. +12 −2 internal/test-support/src/main/groovy/geb/test/CallbackAndWebDriverServer.groovy
  38. +11 −0 internal/test-support/src/main/groovy/geb/test/CallbackHttpServer.groovy
  39. +5 −0 internal/test-support/src/main/groovy/geb/test/CallbackHttpsServer.groovy
  40. +18 −1 internal/test-support/src/main/groovy/geb/test/GebSpecWithCallbackServer.groovy
  41. +4 −9 internal/test-support/src/main/groovy/geb/test/GebSpecWithServer.groovy
  42. +30 −4 internal/test-support/src/main/groovy/geb/test/TestHttpServer.groovy
  43. +12 −2 internal/test-support/src/main/groovy/geb/test/WebDriverServer.groovy
  44. +8 −17 ...ces/ExampleSpec.text → internal/test-support/src/main/groovy/geb/test/browsers/ChromeLinux.groovy
  45. +15 −3 internal/test-support/src/main/resources/SpockConfig.groovy
  46. 0 {module/geb-core/src/test → internal/test-support/src/main}/resources/jquery-1.4.2.min.js
  47. +2 −1 internal/test-support/test-support.gradle
  48. +31 −10 module/geb-core/geb-core.gradle
  49. +10 −10 module/geb-core/src/main/groovy/geb/Configuration.groovy
  50. +8 −3 module/geb-core/src/main/groovy/geb/Module.groovy
  51. +4 −87 module/geb-core/src/main/groovy/geb/Page.groovy
  52. +34 −0 module/geb-core/src/main/groovy/geb/collection/FilteringIterable.groovy
  53. +58 −0 module/geb-core/src/main/groovy/geb/collection/FilteringIterator.groovy
  54. +2 −84 module/geb-core/src/main/groovy/geb/content/ModuleBaseDefinitionDelegate.groovy
  55. +1 −82 module/geb-core/src/main/groovy/geb/content/PageContentTemplateFactoryDelegate.groovy
  56. +1 −82 module/geb-core/src/main/groovy/geb/content/TemplateDerivedPageContent.groovy
  57. +8 −1 module/geb-core/src/main/groovy/geb/driver/SauceLabsDriverFactory.groovy
  58. +1 −1 module/geb-core/src/main/groovy/geb/error/UnableToLoadException.groovy
  59. +2 −2 module/geb-core/src/main/groovy/geb/module/RadioButtons.groovy
  60. +0 −402 module/geb-core/src/main/groovy/geb/navigator/AbstractNavigator.groovy
  61. +83 −4 module/geb-core/src/main/groovy/geb/navigator/BasicLocator.groovy
  62. +0 −40 module/geb-core/src/main/groovy/geb/navigator/DefaultLocator.groovy
  63. +1,275 −0 module/geb-core/src/main/groovy/geb/navigator/DefaultNavigator.groovy
  64. +0 −297 module/geb-core/src/main/groovy/geb/navigator/EmptyNavigator.groovy
  65. +2 −86 module/geb-core/src/main/groovy/geb/navigator/Locator.groovy
  66. +2 −0 module/geb-core/src/main/groovy/geb/navigator/Navigator.groovy
  67. +0 −903 module/geb-core/src/main/groovy/geb/navigator/NonEmptyNavigator.groovy
  68. +134 −18 module/geb-core/src/main/groovy/geb/navigator/SearchContextBasedBasicLocator.groovy
  69. +63 −0 module/geb-core/src/main/groovy/geb/navigator/WebElementPredicates.groovy
  70. +8 −13 module/geb-core/src/main/groovy/geb/navigator/factory/AbstractNavigatorFactory.groovy
  71. +1 −1 module/geb-core/src/main/groovy/geb/navigator/factory/ClosureInnerNavigatorFactory.groovy
  72. +4 −12 module/geb-core/src/main/groovy/geb/navigator/factory/DefaultInnerNavigatorFactory.groovy
  73. +2 −3 module/geb-core/src/main/groovy/geb/navigator/factory/InnerNavigatorFactory.groovy
  74. +2 −2 module/geb-core/src/main/groovy/geb/waiting/DefaultWaitingSupport.groovy
  75. +2 −2 module/geb-core/src/main/groovy/geb/waiting/UninitializedWaitingSupport.groovy
  76. +4 −4 module/geb-core/src/main/groovy/geb/waiting/WaitingSupport.groovy
  77. +1 −1 module/geb-core/src/test/groovy/geb/ContentBoundsSpec.groovy
  78. +2 −2 module/geb-core/src/test/groovy/geb/ContentToStringSpec.groovy
  79. +1 −1 module/geb-core/src/test/groovy/geb/ContentWaitConditionSpec.groovy
  80. +0 −4 module/geb-core/src/test/groovy/geb/DriveSpec.groovy
  81. +2 −2 module/geb-core/src/test/groovy/geb/NavigableSpec.groovy
  82. +7 −18 module/geb-core/src/test/groovy/geb/RemoteDriverSpec.groovy
  83. +57 −0 module/geb-core/src/test/groovy/geb/collection/FilteringIteratorSpec.groovy
  84. +18 −0 module/geb-core/src/test/groovy/geb/conf/ConfigurationLoaderSpec.groovy
  85. +5 −6 module/geb-core/src/test/groovy/geb/conf/ConfigurationNavigatorFactorySpec.groovy
  86. +1 −1 module/geb-core/src/test/groovy/geb/download/HttpsDownloadingSpec.groovy
  87. +1 −1 module/geb-core/src/test/groovy/geb/driver/DriverWithInvalidGetCurrentUrlImplementationSpec.groovy
  88. +19 −1 module/geb-core/src/test/groovy/geb/driver/WebDriverCommandsSpec.groovy
  89. +0 −6 module/geb-core/src/test/groovy/geb/module/DateInputSpec.groovy
  90. +71 −0 module/geb-core/src/test/groovy/geb/module/DynamicNavigatorBasedModuleSpec.groovy
  91. +8 −0 module/geb-core/src/test/groovy/geb/module/RadioButtonsSpec.groovy
  92. +3 −4 module/geb-core/src/test/groovy/geb/navigator/CustomNavigatorSpec.groovy
  93. +986 −0 module/geb-core/src/test/groovy/geb/navigator/DynamicNavigatorSpec.groovy
  94. +98 −19 module/geb-core/src/test/groovy/geb/navigator/EmptyNavigatorSpec.groovy
  95. +13 −0 module/geb-core/src/test/groovy/geb/navigator/NavigatorSpec.groovy
  96. +6 −6 module/geb-core/src/test/groovy/geb/waiting/WaitingSupportSpec.groovy
  97. +37 −16 ...s/src/main/groovy/geb/transform/implicitassertions/ImplicitAssertionsTransformationVisitor.groovy
  98. +11 −3 ...ions/src/test/groovy/geb/transform/implicitassertions/ImplicitAssertionsTransformationSpec.groovy
  99. +11 −1 module/geb-implicit-assertions/src/test/resources/TransformedClass.template
  100. +0 −13 module/geb-junit3/geb-junit3.gradle
  101. +0 −64 module/geb-junit3/src/main/groovy/geb/junit3/GebReportingTest.groovy
  102. +0 −69 module/geb-junit3/src/main/groovy/geb/junit3/GebTest.groovy
  103. +0 −67 module/geb-junit3/src/test/groovy/geb/junit3/GebReportingTestTest.groovy
  104. +0 −62 module/geb-junit3/src/test/groovy/geb/junit3/GebTestTest.groovy
  105. +4 −11 module/geb-junit4/geb-junit4.gradle
  106. +1 −1 module/geb-junit4/src/test/groovy/geb/junit4/AutoClearWebStorageSpec.groovy
  107. +1 −2 module/geb-junit4/src/test/groovy/geb/junit4/GebReportingTestFailureReportTest.groovy
  108. +2 −1 module/geb-junit4/src/test/groovy/geb/junit4/GebReportingTestTest.groovy
  109. +1 −1 module/geb-junit4/src/test/groovy/geb/junit4/GebTestTest.groovy
  110. +0 −8 module/geb-spock/geb-spock.gradle
  111. +6 −7 module/geb-spock/src/test/groovy/geb/spock/GebReportingSpecSpec.groovy
  112. +1 −1 module/geb-spock/src/test/groovy/geb/spock/GebSpecSpec.groovy
  113. +1 −1 module/geb-spock/src/test/groovy/geb/spock/GebSpecStepwiseSpec.groovy
  114. +0 −4 module/geb-spock/src/test/groovy/geb/spock/ReportNameGebSpec.groovy
  115. +1 −1 module/geb-testng/geb-testng.gradle
  116. +1 −1 module/geb-testng/src/test/groovy/geb/testng/GebReportingTestCleanupTest.groovy
  117. +4 −3 module/geb-testng/src/test/groovy/geb/testng/GebReportingTestTest.groovy
  118. +1 −1 module/geb-testng/src/test/groovy/geb/testng/GebTestTest.groovy
  119. +20 −26 module/geb-waiting/src/main/groovy/geb/waiting/Wait.groovy
  120. +1 −4 settings.gradle
78 changes: 37 additions & 41 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ version: 2
jobs:
modules:
docker:
- image: gebish/ci:v6
- image: gebish/ci:v7
environment:
GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
GRADLE_USER_HOME: .gradle-home
@@ -18,27 +18,9 @@ jobs:
key: gradle-home-modules
paths:
- .gradle-home
compatibility:
docker:
- image: gebish/ci:v6
environment:
GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
GRADLE_USER_HOME: .gradle-home
steps:
- checkout
- restore_cache:
keys:
- gradle-home-compatibility
- run: ./gradlew --no-daemon --max-workers 2 --parallel -p compatibility -Pci check --continue
- store_artifacts:
path: build/reports
- save_cache:
key: gradle-home-compatibility
paths:
- .gradle-home
integrations:
docker:
- image: gebish/ci:v6
- image: gebish/ci:v7
environment:
GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
GRADLE_USER_HOME: .gradle-home
@@ -55,30 +37,25 @@ jobs:
paths:
- .gradle-home
manual:
docker:
- image: gebish/ci:v6
environment:
GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
GRADLE_USER_HOME: .gradle-home
machine: true
steps:
- checkout
- restore_cache:
keys:
- gradle-home-manual
- gradle-home-manual-machine
- run:
command: |
Xvfb :99 -screen 1 1280x1024x16 -nolisten tcp -fbdir /var/run > /dev/null 2>&1 &
export DISPLAY=:99
./gradlew --no-daemon --max-workers 2 --parallel -Pci :doc:manual-snippets:check :doc:manual:build
export WORKING_DIRECTORY=`pwd`
docker run -v ${WORKING_DIRECTORY}:${WORKING_DIRECTORY} -v /var/run/docker.sock:/var/run/docker.sock -w ${WORKING_DIRECTORY} gebish/ci:v7 /bin/bash -c "Xvfb :99 -screen 1 1280x1024x16 -nolisten tcp -fbdir /var/run > /dev/null 2>&1 & export DISPLAY=:99 ; GRADLE_OPTS=\"-Xmx1024m -XX:MaxMetaspaceSize=256m\" GRADLE_USER_HOME=\".gradle-home\" ./gradlew --no-daemon --max-workers 2 --parallel -Pci :doc:manual-snippets:check :doc:manual:build"
- store_artifacts:
path: build/reports
- save_cache:
key: gradle-home-manual
key: gradle-home-manual-machine
paths:
- .gradle-home
site:
docker:
- image: gebish/ci:v6
- image: gebish/ci:v7
environment:
GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
GRADLE_USER_HOME: .gradle-home
@@ -94,9 +71,26 @@ jobs:
key: gradle-home-site
paths:
- .gradle-home
local-cross-browser:
machine: true
steps:
- checkout
- restore_cache:
keys:
- gradle-home-local-crossbrowser
- run:
command: |
export WORKING_DIRECTORY=`pwd`
docker run -v ${WORKING_DIRECTORY}:${WORKING_DIRECTORY} -v /var/run/docker.sock:/var/run/docker.sock -w ${WORKING_DIRECTORY} gebish/ci:v7 /bin/bash -c "Xvfb :99 -screen 1 1280x1024x16 -nolisten tcp -fbdir /var/run > /dev/null 2>&1 & export DISPLAY=:99 ; GRADLE_OPTS=\"-Xmx1024m -XX:MaxMetaspaceSize=256m\" GRADLE_USER_HOME=\".gradle-home\" ./gradlew --no-daemon --parallel -Pci allLocalCrossBrowserTests"
- store_artifacts:
path: build/reports
- save_cache:
key: gradle-home-local-crossbrowser
paths:
- .gradle-home
saucelabs:
docker:
- image: gebish/ci:v6
- image: gebish/ci:v7
environment:
GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
GRADLE_USER_HOME: .gradle-home
@@ -118,7 +112,7 @@ jobs:
- .gradle-home
non-ie:
docker:
- image: gebish/ci:v6
- image: gebish/ci:v7
environment:
GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
GRADLE_USER_HOME: .gradle-home
@@ -140,7 +134,7 @@ jobs:
- .gradle-home
ie:
docker:
- image: gebish/ci:v6
- image: gebish/ci:v7
environment:
GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
GRADLE_USER_HOME: .gradle-home
@@ -162,7 +156,7 @@ jobs:
- .gradle-home
upload:
docker:
- image: gebish/ci:v6
- image: gebish/ci:v7
environment:
GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
GRADLE_USER_HOME: .gradle-home
@@ -182,7 +176,7 @@ jobs:
- .gradle-home
publish-site:
docker:
- image: gebish/ci:v6
- image: gebish/ci:v7
steps:
- checkout
- run:
@@ -193,7 +187,7 @@ jobs:
fi
trigger-example-projects:
docker:
- image: gebish/ci:v6
- image: gebish/ci:v7
steps:
- run:
command: |
@@ -209,19 +203,20 @@ workflows:
build-workflow:
jobs:
- modules
- compatibility
- integrations:
requires:
- modules
- compatibility
- manual:
requires:
- modules
- compatibility
- site:
requires:
- modules
- compatibility
- local-cross-browser:
requires:
- integrations
- manual
- site
- saucelabs:
requires:
- integrations
@@ -237,6 +232,7 @@ workflows:
- non-ie
- upload:
requires:
- local-cross-browser
- saucelabs
- ie
filters:
16 changes: 0 additions & 16 deletions compatibility/groovy-2.3.7/groovy-2.3.7.gradle
View file

This file was deleted.

11 changes: 0 additions & 11 deletions compatibility/spock-1.0/spock-1.0.gradle
View file

This file was deleted.

92 changes: 0 additions & 92 deletions ...ock-1.0/src/test/groovy/geb/transform/implicitassertions/Spock1Dot0IntegrationSpec.groovy
View file

This file was deleted.

18 changes: 0 additions & 18 deletions compatibility/spock-1.0/src/test/resources/ExampleSpec2.text
View file

This file was deleted.

1 change: 1 addition & 0 deletions doc/manual-snippets/manual-snippets.gradle
View file
Original file line number Diff line number Diff line change
@@ -33,4 +33,5 @@ test {

idea.module {
testSourceDirs += sourceSets.realBrowserTest.allSource.srcDirs
scopes.TEST.plus += [configurations.realBrowserTestCompile]
}
9 changes: 0 additions & 9 deletions doc/manual-snippets/src/realBrowserTest/groovy/intro/ScriptingSpec.groovy
View file
Original file line number Diff line number Diff line change
@@ -18,21 +18,12 @@ package intro
// tag::imports[]
import geb.Browser
// end::imports[]
import geb.driver.CachingDriverFactory
import intro.page.GebHomePage
import intro.page.TheBookOfGebPage
import spock.lang.Specification

class ScriptingSpec extends Specification {

void setupSpec() {
CachingDriverFactory.clearCacheAndQuitDriver()
}

void cleanupSpec() {
CachingDriverFactory.clearCacheAndQuitDriver()
}

def "inline"() {
expect:
// tag::inline[]
Loading