diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index db43d4e7..315b2d62 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -63,14 +63,3 @@ The project can be built from the root directory using the standard Maven comman ---- $ ./mvnw clean install ---- - -The project also has Selenium tests that instrument the client side. In order to run them -you need first to install Firefox and the latest -https://github.com/mozilla/geckodriver[geckodriver]. - -Once those are installed you can run the smoke tests by enabling an extra profile: - -[indent=0] ----- - $ ./mvnw verify -PsmokeTests ----- diff --git a/README.adoc b/README.adoc index 69014b5b..8c5a5a01 100644 --- a/README.adoc +++ b/README.adoc @@ -208,14 +208,6 @@ Just invoke the build at the root of the project $ ./mvnw clean install ---- -If you want to run the smoke tests using Geb, you need to enable the -`smokeTests` profile. Firefox should also be installed on your machine: - -[indent=0] ----- - $ ./mvnw verify -PsmokeTests ----- - To generate the docs as well, you should enable the `full` profile: [indent=0] diff --git a/initializr-web/pom.xml b/initializr-web/pom.xml index 283ea6ac..ee97b7de 100644 --- a/initializr-web/pom.xml +++ b/initializr-web/pom.xml @@ -114,16 +114,6 @@ jsonassert test - - org.seleniumhq.selenium - selenium-firefox-driver - test - - - org.seleniumhq.selenium - selenium-support - test - @@ -176,37 +166,6 @@ - - smokeTests - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - integration-test - - test - - - - true - - - **/*SmokeTests.java - - - **/Abstract*.java - - - - - - - - diff --git a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java index 1eda3a6e..48f1a9b3 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java @@ -60,7 +60,6 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; -import org.springframework.web.servlet.resource.ResourceUrlProvider; /** * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration @@ -149,12 +148,10 @@ public class InitializrAutoConfiguration { public MainController initializrMainController( InitializrMetadataProvider metadataProvider, TemplateRenderer templateRenderer, - ResourceUrlProvider resourceUrlProvider, DependencyMetadataProvider dependencyMetadataProvider, ProjectGenerationInvoker projectGenerationInvoker) { return new MainController(metadataProvider, templateRenderer, - resourceUrlProvider, dependencyMetadataProvider, - projectGenerationInvoker); + dependencyMetadataProvider, projectGenerationInvoker); } @Bean diff --git a/initializr-web/src/main/java/io/spring/initializr/web/project/AbstractInitializrController.java b/initializr-web/src/main/java/io/spring/initializr/web/project/AbstractInitializrController.java index 31676b97..2ea87fcf 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/project/AbstractInitializrController.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/project/AbstractInitializrController.java @@ -24,7 +24,6 @@ import io.spring.initializr.metadata.InitializrMetadataProvider; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.servlet.resource.ResourceUrlProvider; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; /** @@ -38,8 +37,7 @@ public abstract class AbstractInitializrController { private Boolean forceSsl; - protected AbstractInitializrController(InitializrMetadataProvider metadataProvider, - ResourceUrlProvider resourceUrlProvider) { + protected AbstractInitializrController(InitializrMetadataProvider metadataProvider) { this.metadataProvider = metadataProvider; } diff --git a/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java b/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java index 7acd1f3a..4cc3eca8 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java @@ -64,7 +64,6 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.resource.ResourceUrlProvider; /** * The main initializr controller provides access to the configured metadata and serves as @@ -91,10 +90,10 @@ public class MainController extends AbstractInitializrController { private final ProjectGenerationInvoker projectGenerationInvoker; public MainController(InitializrMetadataProvider metadataProvider, - TemplateRenderer templateRenderer, ResourceUrlProvider resourceUrlProvider, + TemplateRenderer templateRenderer, DependencyMetadataProvider dependencyMetadataProvider, ProjectGenerationInvoker projectGenerationInvoker) { - super(metadataProvider, resourceUrlProvider); + super(metadataProvider); this.dependencyMetadataProvider = dependencyMetadataProvider; this.commandLineHelpGenerator = new CommandLineHelpGenerator(templateRenderer); this.projectGenerationInvoker = projectGenerationInvoker;