Merge branch '__rultor'

smallcreep · Oct 15, 2018 · 57d9ae0 · 57d9ae0
2 parents 67ea617 + a2bc541
commit 57d9ae0
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 14 deletions.
diff --git a/.rultor.yml b/.rultor.yml
@@ -16,13 +16,13 @@ architect:
 merge:
   script: |
     pdd --file=/dev/null
-    mvn clean install -Pqulice -Pintegration --errors --settings ../settings.xml
+    mvn clean install -Pqulice -Pintegration -Pcucumber --errors --settings ../settings.xml
 deploy:
   script: |
-    mvn clean deploy -Pqulice -Pintegration --errors --settings ../settings.xml
+    mvn clean deploy -Pqulice -Pintegration -Pcucumber --errors --settings ../settings.xml
 release:
   script: |-
     [[ "${tag}" =~ ^[0-9]+(\.[0-9]+){2}$ ]] || exit -1
     mvn versions:set "-DnewVersion=${tag}"
     git commit -am "${tag}"
-    mvn clean deploy -Pcucumber-seeds -Psonar -Pqulice -Pintegration -Psonatype --errors --settings ../settings.xml
+    mvn clean deploy -Pcucumber-seeds -Psonar -Pqulice -Pintegration -Pcucumber -Psonatype --errors --settings ../settings.xml
diff --git a/pom.xml b/pom.xml
@@ -272,8 +272,14 @@ SOFTWARE.
       <build>
         <plugins>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-junit47</artifactId>
+                <version>2.22.0</version>
+              </dependency>
+            </dependencies>
             <configuration>
               <includes>
                 <include>**/*ItCase.java</include>

diff --git a/seeds-core/pom.xml b/seeds-core/pom.xml
@@ -35,7 +35,6 @@ SOFTWARE.
       <groupId>org.cactoos</groupId>
       <artifactId>cactoos</artifactId>
       <version>0.36</version>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
 </project>
diff --git a/seeds-core/src/main/java/com/github/smallcreep/cucumber/seeds/suit/StSmart.java b/seeds-core/src/main/java/com/github/smallcreep/cucumber/seeds/suit/StSmart.java
@@ -81,6 +81,9 @@ public Context context() {
 
     @Override
     public Scenario scenario() {
+        if (this.scenarios.get(Thread.currentThread().getId()) == null) {
+            this.start();
+        }
         return this.scenarios.get(Thread.currentThread().getId());
     }
 

diff --git a/seeds-db/pom.xml b/seeds-db/pom.xml
@@ -41,7 +41,6 @@ SOFTWARE.
       <groupId>com.jcabi</groupId>
       <artifactId>jcabi-jdbc</artifactId>
       <version>0.17.1</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>

diff --git a/test-steps/pom.xml b/test-steps/pom.xml
@@ -87,11 +87,36 @@ SOFTWARE.
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.cactoos</groupId>
-      <artifactId>cactoos</artifactId>
-      <version>0.36</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
+  <profiles>
+    <profile>
+      <id>cucumber</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-junit4</artifactId>
+                <version>2.19.1</version>
+              </dependency>
+            </dependencies>
+            <configuration>
+              <includes>
+                <include>**/*CucumberCase.java</include>
+              </includes>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/...eep/cucumber/seeds/test/ParallelTest.java → ...mber/seeds/test/ParallelCucumberCase.java b/...eep/cucumber/seeds/test/ParallelTest.java → ...mber/seeds/test/ParallelCucumberCase.java
@@ -61,12 +61,12 @@
         "~@inprogress"
     }
 )
-public final class ParallelTest {
+public final class ParallelCucumberCase {
 
     /**
      * Ctor.
      */
-    private ParallelTest() {
+    private ParallelCucumberCase() {
     }
 
     /**