Skip to content

Commit

Permalink
Fix for #3258
Browse files Browse the repository at this point in the history
  • Loading branch information
wakaleo committed Sep 13, 2023
1 parent b20e58c commit bfa902d
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 7 deletions.
8 changes: 3 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,8 @@
<byte-buddy.version>1.14.7</byte-buddy.version>
<guava.version>32.1.2-jre</guava.version>
<hamcrest.version>2.2</hamcrest.version>
<!-- <slf4j.version>1.7.30</slf4j.version>-->
<slf4j.version>2.0.7</slf4j.version>
<!-- <guice.version>5.1.0</guice.version>-->
<cucumber.version>7.13.0</cucumber.version>
<cucumber.version>7.14.0</cucumber.version>
<gson.version>2.10.1</gson.version>
<junit5.version>5.10.0</junit5.version>
<mockito.version>3.3.3</mockito.version>
Expand All @@ -74,7 +72,7 @@
<typesafe.version>1.4.2</typesafe.version>
<imgscalr.version>4.2</imgscalr.version>
<awaitility.version>4.2.0</awaitility.version>
<freemarker.version>2.3.31</freemarker.version>
<freemarker.version>2.3.32</freemarker.version>
<appium.version>8.5.1</appium.version>
<fluentlenium.version>0.10.2</fluentlenium.version>
<htmlunit.version>3.4.0</htmlunit.version>
Expand All @@ -85,7 +83,7 @@
<jimfs.version>1.3.0</jimfs.version>
<jbehave.version>4.8.3</jbehave.version>
<ant.version>1.10.12</ant.version>
<restassured.version>5.3.1</restassured.version>
<restassured.version>5.3.2</restassured.version>
<wiremock.version>1.58</wiremock.version>
<thymeleaf.version>3.1.2.RELEASE</thymeleaf.version>
<javassist.version>3.29.2-GA</javassist.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,16 @@ private Set<String> getFileSystemDefinedDirectory() {
private Set<String> getGradleProjectDirectoryAsSet() {

String gradleProjectDir = getGradleProjectDirectory();
String gradleResourcetDir = new File(gradleProjectDir, rootDirectoryPath).getAbsolutePath();
String gradleResourceDir;
if (gradleProjectDir != null && new File(gradleProjectDir).isAbsolute()) {
gradleResourceDir = new File(gradleProjectDir, "src/test/resources/features").getAbsolutePath();
} else {
gradleResourceDir = new File(gradleProjectDir, rootDirectoryPath).getAbsolutePath();
}

if (gradleProjectDir != null) {
Set<String> directory = new HashSet<>();
directory.add(gradleResourcetDir);
directory.add(gradleResourceDir);
return directory;
}
return new HashSet<>();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package net.thucydides.model.requirements;

import net.thucydides.model.environment.MockEnvironmentVariables;
import net.thucydides.model.util.EnvironmentVariables;
import org.junit.jupiter.api.Test;

import java.io.File;
import java.util.Set;

public class WhenFindingTheRootDirectoryForFeatureFiles {

EnvironmentVariables environmentVariables = new MockEnvironmentVariables();

@Test
void withAWindowsPath() {
RootDirectory rootDirectory = new RootDirectory(environmentVariables,"C:\\dev\\src\\test\\resources\\features");
Set<String> directoryPaths = rootDirectory.getRootDirectoryPaths();
}

@Test
void withADefinedProjectDirectory() {
environmentVariables.setProperty("serenity.project.directory",new File(".").getAbsolutePath());
String featureDirectory = new File("src/test/resources/features").getAbsolutePath();
RootDirectory rootDirectory = new RootDirectory(environmentVariables,featureDirectory);
Set<String> directoryPaths = rootDirectory.getRootDirectoryPaths();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -263,4 +263,9 @@ public ValidatableResponse time(Matcher<Long> matcher) {
public ValidatableResponse time(Matcher<Long> matcher, TimeUnit timeUnit) {
return new ValidatableResponseImpl("",null,null,null,null,null);
}

@Override
public ValidatableResponse onFailMessage(String s) {
return new ValidatableResponseImpl("",null,null,null,null,null);
}
}

0 comments on commit bfa902d

Please sign in to comment.