Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Bump chutney to 2.9.0 #6

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump chutney to 2.9.0 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,22 @@ group = "com.chutneytesting"
version = "0.1.0-SNAPSHOT"
description = "A GitHub project template to help you start with Chutney Kotlin DSL"

val chutneyVersion = "2.9.0"

plugins {
kotlin("jvm") version "1.8.22" apply true
kotlin("jvm") version "1.9.25" apply true
}

repositories {
mavenCentral()
}

dependencies {
api("org.jetbrains.kotlin:kotlin-stdlib:1.8.22")
api("com.chutneytesting:chutney-kotlin-dsl:[2.0.0,)")
testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
api("org.jetbrains.kotlin:kotlin-stdlib:1.9.25")

implementation(enforcedPlatform("com.chutneytesting:chutney-parent:$chutneyVersion"))
api("com.chutneytesting:chutney-kotlin-dsl:$chutneyVersion")
testImplementation("org.junit.jupiter:junit-jupiter")
}

tasks.withType<KotlinCompile> {
Expand All @@ -39,12 +43,11 @@ task("chutneyReportSite", JavaExec::class) {

tasks {
test {
systemProperty("chutney.environment.rootPath", "chutney_environments") // Default is .chutney/environments
systemProperty("chutney.environment.rootPath", "chutney/conf/environment") // Default is .chutney/environments
systemProperty("chutney.report.rootPath", "build/reports/chutney")
systemProperty("chutney.engine.stepAsTest", false)
systemProperty("chutney.log.color.enabled", true)

finalizedBy("chutneyReportSite")
}
}

0 chutney_environments/english_web.json → chutney/conf/environment/english_web.json
View file
Open in desktop
File renamed without changes.
0 chutney_environments/french_web.json → chutney/conf/environment/french_web.json
View file
Open in desktop
File renamed without changes.
9 changes: 1 addition & 8 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,9 @@ version: "3.9"
services:
chutney-server:
container_name: chutney-server
image: ghcr.io/chutney-testing/chutney/server:latest
image: ghcr.io/chutney-testing/chutney/chutney-server:latest
restart: unless-stopped
ports:
- "8081:8443"
volumes:
- ./chutney_environments:/.chutney
chutney-ui:
container_name: chutney-ui
image: ghcr.io/chutney-testing/chutney/ui:latest
restart: unless-stopped
ports:
- "80:80"
- "443:443"
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
89 changes: 35 additions & 54 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,51 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>

<kotlin.version>1.8.22</kotlin.version>
<kotlin.compiler.languageVersion>1.9</kotlin.compiler.languageVersion>
<kotlin.compiler.apiVersion>1.9</kotlin.compiler.apiVersion>
<kotlin.compiler.jvmTarget>${maven.compiler.target}</kotlin.compiler.jvmTarget>

<chutney-kotlin-dsl.version>[2.0.0,)</chutney-kotlin-dsl.version>
<junit-jupiter.version>5.8.2</junit-jupiter.version>

<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<kotlin.version>1.9.25</kotlin.version>
<chutney.version>2.9.0</chutney.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-bom</artifactId>
<version>${kotlin.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.chutneytesting</groupId>
<artifactId>chutney-parent</artifactId>
<version>${chutney.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.chutneytesting</groupId>
<artifactId>chutney-kotlin-dsl</artifactId>
<version>${chutney.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version>
</dependency>

<dependency>
<groupId>com.chutneytesting</groupId>
<artifactId>chutney-kotlin-dsl</artifactId>
<version>${chutney-kotlin-dsl.version}</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -47,27 +68,6 @@
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<systemPropertyVariables>
<chutney.environment.rootPath>chutney_environments</chutney.environment.rootPath>
<chutney.report.rootPath>target/chutney/reports</chutney.report.rootPath>
</systemPropertyVariables>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M7</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
Expand All @@ -89,36 +89,17 @@
</executions>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<includes>
<include>**/*Test.*</include>
</includes>
<classesDirectory>${project.build.outputDirectory}</classesDirectory>
<systemProperties>
<chutney.environment.rootPath>${project.basedir}/chutney_environments</chutney.environment.rootPath>
<systemPropertyVariables>
<chutney.environment.rootPath>${project.basedir}/chutney/conf/environment</chutney.environment.rootPath>
<chutney.report.rootPath>${project.build.directory}/chutney-reports</chutney.report.rootPath>
<chutney.engine.stepAsTest>false</chutney.engine.stepAsTest>
<chutney.log.color.enabled>true</chutney.log.color.enabled>
</systemProperties>
</systemPropertyVariables>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>

6 changes: 5 additions & 1 deletion src/main/kotlin/com/chutneytesting/hello/SynchronizeToServer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.chutneytesting.hello

import com.chutneytesting.kotlin.synchronize.jsonSerialize
import com.chutneytesting.kotlin.synchronize.synchronise
import com.chutneytesting.kotlin.util.ChutneyServerInfo

Expand All @@ -8,5 +9,8 @@ val chutneyLocalServer = ChutneyServerInfo(
)

fun main() {
test_suite.forEach { it.synchronise(serverInfo = chutneyLocalServer, updateRemote = true) }
test_suite.forEach {
it.jsonSerialize("src/main/resources/chutney/in_progress")
it.synchronise(serverInfo = chutneyLocalServer)
}
}
Loading