mirror of
https://github.com/jlengrand/atrium.git
synced 2026-03-10 08:01:19 +00:00
remove jasmine sample and turn mocha sample into js sample
It is very unlikely someone uses JS with jasmine as jetbrains has setup everything with mocha
This commit is contained in:
Robert Stoll
8
.github/workflows/samples-windows.yml
vendored
8
.github/workflows/samples-windows.yml
vendored
@@ -31,13 +31,9 @@ jobs:
|
||||
restore-keys: |
|
||||
samples-${{ runner.os }}-maven-
|
||||
|
||||
- name: build jasmine sample
|
||||
- name: build js sample
|
||||
run: ./gradlew build
|
||||
working-directory: samples\js\jasmine
|
||||
|
||||
- name: build mocha sample
|
||||
run: ./gradlew build
|
||||
working-directory: samples\js\mocha
|
||||
working-directory: samples\js
|
||||
|
||||
- name: build Spek sample
|
||||
run: ./gradlew build
|
||||
|
||||
@@ -34,8 +34,7 @@ jobs:
|
||||
- env: MODE=samples
|
||||
script:
|
||||
- set -e
|
||||
- samples/js/jasmine/gradlew -p ./samples/js/jasmine build
|
||||
- samples/js/mocha/gradlew -p ./samples/js/mocha build
|
||||
- samples/js/gradlew -p ./samples/js build
|
||||
- samples/jvm/spek/gradlew -p ./samples/jvm/spek build
|
||||
- samples/jvm/junit5/gradlew -p ./samples/jvm/junit5 build
|
||||
# in case of travis problems installing jdk11
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
def samples = ['jasmine', 'mocha', 'junit5', 'spek', 'multiplatform']
|
||||
def samples = ['js', 'junit5', 'spek', 'multiplatform']
|
||||
|
||||
task build {
|
||||
samples.forEach { projectName ->
|
||||
|
||||
@@ -12,6 +12,5 @@ includeBuild('../../../') {
|
||||
}
|
||||
includeBuild '../../../samples/jvm/junit5'
|
||||
includeBuild '../../../samples/jvm/spek'
|
||||
includeBuild '../../../samples/js/jasmine'
|
||||
includeBuild '../../../samples/js/mocha'
|
||||
includeBuild '../../../samples/js'
|
||||
includeBuild '../../../samples/multiplatform'
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
# Sample JS project: Atrium with jasmine
|
||||
|
||||
This example project is heavily based on [kotlin's example](https://github.com/JetBrains/kotlin-examples/blob/master/gradle/js-tests/mocha).
|
||||
Yet with a few optimizations and adaptations:
|
||||
- it stores nodejs and npm only once per project (and not for every sub project)
|
||||
- it uses `--prefer-offline` for a faster build and offline capability
|
||||
- it uses sourceMap so that debugging in kotlin code is possible (as good as your IDE supports it)
|
||||
- it includes all test dependencies, also runtime only dependencies
|
||||
- it does not force a `moduleKind` on src/main
|
||||
- last but not least and this is the important part, **it establishes a dependency to Atrium on JS level**
|
||||
which is necessary due to the loosely coupled design of Atrium and dead code elimination.
|
||||
@@ -1,99 +0,0 @@
|
||||
// Example project to show how to use Atrium in combination with jasmine
|
||||
// For more information on how to setup Atrium for a JS project -> https://github.com/robstoll/atrium#js
|
||||
|
||||
buildscript {
|
||||
ext {
|
||||
kotlin_version = '1.4.10'
|
||||
// for infix-api -> change to 'atrium-infix-en_GB-js'
|
||||
atrium_api = 'atrium-fluent-en_GB-js'
|
||||
atrium_version = '0.14.0.RC1'
|
||||
}
|
||||
repositories {
|
||||
maven { url "https://plugins.gradle.org/m2/" }
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.github.node-gradle:gradle-node-plugin:2.2.0'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin2js'
|
||||
apply plugin: 'com.github.node-gradle.node'
|
||||
|
||||
group 'org.atriumlib.samples'
|
||||
version '0.0.1'
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-js"
|
||||
|
||||
// setup for Atrium:
|
||||
testImplementation("ch.tutteli.atrium:$atrium_api:$atrium_version")
|
||||
|
||||
// setup for jasmine:
|
||||
testImplementation "org.jetbrains.kotlin:kotlin-test-js"
|
||||
}
|
||||
|
||||
// we only configure compileTestKotlin2Js and not compileKotlin2Js as well
|
||||
// so that you can also use UMD as moduleKind for compileKotlin2Js
|
||||
compileTestKotlin2Js.configure {
|
||||
// jasmine requires commonjs
|
||||
kotlinOptions.moduleKind = "commonjs"
|
||||
|
||||
// the following allows that debugging tests kind of works within kotlin
|
||||
// sometimes break points within a kotlin file is not taken up by Intellij.
|
||||
// in such a case it is worth while to create a break point in build/classes/kotlin/test/...test.js
|
||||
// stepping through the js code then usually switches to the kotlin file.
|
||||
kotlinOptions.sourceMap = true
|
||||
kotlinOptions.sourceMapEmbedSources = "always"
|
||||
}
|
||||
|
||||
//gather all required dependencies and put them into the node_modules folder of this (sub)-project
|
||||
task populateNodeModules(type: Copy, dependsOn: compileKotlin2Js) {
|
||||
from compileKotlin2Js.destinationDir
|
||||
|
||||
afterEvaluate {
|
||||
// in contrast to kotlin examples we use testRuntimeClasspath this way we also pick up runtimeOnly dependencies
|
||||
configurations.testRuntimeClasspath.each {
|
||||
from zipTree(it.absolutePath).matching { include '*.js', '*.js.map' }
|
||||
}
|
||||
}
|
||||
|
||||
into "$buildDir/node_modules"
|
||||
}
|
||||
|
||||
//node, npm and dependencies of jasmine is installed in the same folder for all sub-projects
|
||||
def nodeModulesParentDir = file("$rootProject.projectDir/gradle/")
|
||||
node {
|
||||
//download this way we don't have to download each time
|
||||
download = true
|
||||
npmVersion = '6.4.1'
|
||||
workDir = file("$rootProject.projectDir/.gradle/nodejs")
|
||||
npmWorkDir = file("$rootProject.projectDir/.gradle/npm")
|
||||
nodeModulesDir = nodeModulesParentDir
|
||||
}
|
||||
|
||||
//either you use this task or create a testSetup.kt in your src/test with the following content
|
||||
//
|
||||
// // adopt to the api you use
|
||||
// import ch.tutteli.atrium.fluent.en_GB.dependOnAtrium
|
||||
//
|
||||
// @Suppress("unused")
|
||||
// private val establishDependencyToAtrium = dependOnAtrium()
|
||||
task establishDependencyToAtrium(dependsOn: [compileTestKotlin2Js]) {
|
||||
doLast {
|
||||
def srcFile = file("$buildDir/classes/kotlin/test/${project.name}_test.js")
|
||||
String newContent = srcFile.getText('UTF-8')
|
||||
.replace("(function (_, Kotlin,", "(function (_, Kotlin, \$module\$${atrium_api.replace('-', '_')},")
|
||||
.replace("(module.exports, require('kotlin'),", "(module.exports, require('kotlin'), require('$atrium_api'),")
|
||||
srcFile.write(newContent, 'UTF-8')
|
||||
}
|
||||
}
|
||||
task runJasmine(type: NpxTask, group: 'Verification', dependsOn: [populateNodeModules, test, establishDependencyToAtrium]) {
|
||||
command = "jasmine"
|
||||
args = [compileTestKotlin2Js.outputFile]
|
||||
}
|
||||
check.dependsOn runJasmine
|
||||
@@ -1 +0,0 @@
|
||||
rootProject.name = "jasmine"
|
||||
@@ -1,39 +0,0 @@
|
||||
package org.atriumlib.samples.jasmine
|
||||
|
||||
import ch.tutteli.atrium.api.fluent.en_GB.*
|
||||
import ch.tutteli.atrium.api.verbs.expect
|
||||
import ch.tutteli.atrium.creating.Expect
|
||||
import ch.tutteli.atrium.reporting.RawString
|
||||
import ch.tutteli.atrium.translations.DescriptionBasic.IS
|
||||
import kotlin.test.Test
|
||||
|
||||
class SampleJsTest {
|
||||
@Test
|
||||
fun toBe() {
|
||||
expect(1).toBe(1)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun expectAnExceptionOccurred() {
|
||||
expect {
|
||||
throw IllegalArgumentException()
|
||||
}.toThrow<IllegalArgumentException>()
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
fun expectAnExceptionWithAMessageOccurred() {
|
||||
expect {
|
||||
throw IllegalArgumentException("oho... hello btw")
|
||||
}.toThrow<IllegalArgumentException> {
|
||||
messageContains("hello")
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun useOwnFunction() {
|
||||
expect(2).isEven()
|
||||
}
|
||||
}
|
||||
|
||||
fun Expect<Int>.isEven() = createAndAddAssertion(IS, RawString.create("an even number")) { it % 2 == 0 }
|
||||
BIN
samples/js/mocha/gradle/wrapper/gradle-wrapper.jar
vendored
BIN
samples/js/mocha/gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
@@ -1,5 +0,0 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
185
samples/js/mocha/gradlew
vendored
185
samples/js/mocha/gradlew
vendored
@@ -1,185 +0,0 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# Copyright 2015 the original author or authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
nonstop=true
|
||||
;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=`expr $i + 1`
|
||||
done
|
||||
case $i in
|
||||
0) set -- ;;
|
||||
1) set -- "$args0" ;;
|
||||
2) set -- "$args0" "$args1" ;;
|
||||
3) set -- "$args0" "$args1" "$args2" ;;
|
||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
APP_ARGS=`save "$@"`
|
||||
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
89
samples/js/mocha/gradlew.bat
vendored
89
samples/js/mocha/gradlew.bat
vendored
@@ -1,89 +0,0 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
Reference in New Issue
Block a user