Merge branch 'develop' into bugfix/#631

FluentLenium · Jan 4, 2019 · 067d863 · 067d863
2 parents a438dab + 119a44f
commit 067d863
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -4,29 +4,29 @@
 [![Coveralls](https://coveralls.io/repos/github/FluentLenium/FluentLenium/badge.svg?branch=develop)](https://coveralls.io/github/FluentLenium/FluentLenium?branch=develop)
 [![Maintainability](https://api.codeclimate.com/v1/badges/27aabb596e9d9eee7182/maintainability)](https://codeclimate.com/github/FluentLenium/FluentLenium/maintainability)
 [![Maven Central](https://img.shields.io/maven-central/v/org.fluentlenium/fluentlenium-parent.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.fluentlenium%22%20AND%20a%3A%22fluentlenium-parent%22)
-[![Website](https://img.shields.io/website-up-down-green-red/http/fluentlenium.org.svg)](http://fluentlenium.org)
+[![Website](https://img.shields.io/website-up-down-green-red/http/fluentlenium.com.svg)](https://fluentlenium.com)
 
 FluentLenium helps you writing readable, reusable, reliable and resilient UI functional tests for the browser.
 
 FluentLenium provides a Java [fluent interface](http://en.wikipedia.org/wiki/Fluent_interface) to
-[Selenium](http://www.seleniumhq.org/), and brings some [extra features](http://fluentlenium.org/docs/key_features/)
+[Selenium](http://www.seleniumhq.org/), and brings some [extra features](https://fluentlenium.com/docs/key_features/)
  to avoid common issues faced by Selenium users.
 
-FluentLenium is shipped with adapters for [JUnit4](https://junit.org/junit4/), [JUnit5](https://junit.org/junit5/), [TestNG](http://testng.org/doc/index.html), [Spock](http://spockframework.org/) and [Cucumber](https://cucumber.io), but it can also be used [standalone](http://fluentlenium.org/docs/test-runners/#standalone-mode).
+FluentLenium is shipped with adapters for [JUnit4](https://junit.org/junit4/), [JUnit5](https://junit.org/junit5/), [TestNG](http://testng.org/doc/index.html), [Spock](http://spockframework.org/) and [Cucumber](https://cucumber.io), but it can also be used [standalone](https://fluentlenium.com/docs/test-runners/#standalone-mode).
 
 FluentLenium best integrates with [AssertJ](http://joel-costigliola.github.io/assertj/), but you can also choose to use
-the [assertion framework](http://fluentlenium.org/docs/assertion-libraries/) you want.
+the [assertion framework](https://fluentlenium.com/docs/assertion-libraries/) you want.
 
-FluentLenium gives you [multiple methods](http://fluentlenium.org/docs/test-methods/) which help you write tests quicker. All those methods are tested daily by commercial regression test suites maintained by project developers.
+FluentLenium gives you [multiple methods](https://fluentlenium.com/docs/test-methods/) which help you write tests quicker. All those methods are tested daily by commercial regression test suites maintained by project developers.
 
 ## Documentation
 
-Detailed documentation is available on [fluentlenium.org](http://fluentlenium.org).
+Detailed documentation is available on [fluentlenium.com](https://fluentlenium.com).
 
 
 # Quickstart with JUnit and AssertJ
 
-Quickstart steps are described in detail in our [separate documentation section](http://fluentlenium.org/quickstart/).
+Quickstart steps are described in detail in our [separate documentation section](https://fluentlenium.com/quickstart/).
 
 Short summary:
 
@@ -92,7 +92,7 @@ public class DuckDuckGoTest extends FluentTest {
 - Run as a JUnit test.
 
 More detailed FluentLenium examples are available in [examples section](https://github.com/FluentLenium/FluentLenium/tree/develop/examples).
-Examples include `headless` Chrome and Firefox, [Spring](https://spring.io/)-based framework supporting multiple browsers and [much more](http://fluentlenium.org/quickstart/#more-examples).
+Examples include `headless` Chrome and Firefox, [Spring](https://spring.io/)-based framework supporting multiple browsers and [much more](https://fluentlenium.com/quickstart/#more-examples).
 
 ## Contact Us
 If you have any comment, remark or issue, please open an issue on

diff --git a/docs/CNAME b/docs/CNAME
@@ -1 +1 @@
-fluentlenium.org
+fluentlenium.com
diff --git a/docs/README.md b/docs/README.md
@@ -1,6 +1,6 @@
 # FluentLenium Site
 
-This directory contains the code for the FluentLenium Site, [http://fluentlenium.org/](http://fluentlenium.org/).
+This directory contains the code for the FluentLenium Site, [http://fluentlenium.com/](http://fluentlenium.com/).
 
 ## Running locally
 

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -10,7 +10,7 @@ fluentlenium:
 selenium:
   version: "3.141.59"
 
-url: "http://fluentlenium.org"
+url: "http://fluentlenium.com"
 baseurl: ""
 
 # If you are building a GitHub project page then use these settings:
@@ -95,7 +95,7 @@ share-links-active:
 
 # How to display the link to the website in the footer
 # Remove this if you don't want a link in the footer
-url-pretty: "fluentlenium.org"  # eg. "deanattali.com/beautiful-jekyll"
+url-pretty: "fluentlenium.com"  # eg. "deanattali.com/beautiful-jekyll"
 
 # --- Misc --- #
 

diff --git a/fluentlenium-core/src/test/java/org/fluentlenium/utils/UrlUtilsTest.java b/fluentlenium-core/src/test/java/org/fluentlenium/utils/UrlUtilsTest.java
@@ -6,50 +6,50 @@
 public class UrlUtilsTest {
     @Test
     public void testBaseUrlWithoutTrailingSlash() {
-        String test = UrlUtils.concat("http://fluentlenium.org", "abc/def");
-        Assertions.assertThat(test).isEqualTo("http://fluentlenium.org/abc/def");
+        String test = UrlUtils.concat("http://fluentlenium.com", "abc/def");
+        Assertions.assertThat(test).isEqualTo("http://fluentlenium.com/abc/def");
     }
 
     @Test
     public void testBaseUrlWithTrailingSlash() {
-        String test = UrlUtils.concat("http://fluentlenium.org/", "abc/def");
-        Assertions.assertThat(test).isEqualTo("http://fluentlenium.org/abc/def");
+        String test = UrlUtils.concat("http://fluentlenium.com/", "abc/def");
+        Assertions.assertThat(test).isEqualTo("http://fluentlenium.com/abc/def");
     }
 
     @Test
     public void testBaseUrlWithPathWithoutTrailingSlash() {
-        String test = UrlUtils.concat("http://fluentlenium.org/path", "abc/def");
-        Assertions.assertThat(test).isEqualTo("http://fluentlenium.org/path/abc/def");
+        String test = UrlUtils.concat("http://fluentlenium.com/path", "abc/def");
+        Assertions.assertThat(test).isEqualTo("http://fluentlenium.com/path/abc/def");
     }
 
     @Test
     public void testBaseUrlWithPathWithTrailingSlash() {
-        String test = UrlUtils.concat("http://fluentlenium.org/path/", "abc/def");
-        Assertions.assertThat(test).isEqualTo("http://fluentlenium.org/path/abc/def");
+        String test = UrlUtils.concat("http://fluentlenium.com/path/", "abc/def");
+        Assertions.assertThat(test).isEqualTo("http://fluentlenium.com/path/abc/def");
     }
 
     @Test
     public void testBaseUrlWithoutTrailingSlashRootPath() {
-        String test = UrlUtils.concat("http://fluentlenium.org", "/abc/def");
-        Assertions.assertThat(test).isEqualTo("http://fluentlenium.org/abc/def");
+        String test = UrlUtils.concat("http://fluentlenium.com", "/abc/def");
+        Assertions.assertThat(test).isEqualTo("http://fluentlenium.com/abc/def");
     }
 
     @Test
     public void testBaseUrlWithTrailingSlashRootPath() {
-        String test = UrlUtils.concat("http://fluentlenium.org/", "/abc/def");
-        Assertions.assertThat(test).isEqualTo("http://fluentlenium.org/abc/def");
+        String test = UrlUtils.concat("http://fluentlenium.com/", "/abc/def");
+        Assertions.assertThat(test).isEqualTo("http://fluentlenium.com/abc/def");
     }
 
     @Test
     public void testBaseUrlWithPathWithoutTrailingSlashRootPath() {
-        String test = UrlUtils.concat("http://fluentlenium.org/path", "/abc/def");
-        Assertions.assertThat(test).isEqualTo("http://fluentlenium.org/path/abc/def");
+        String test = UrlUtils.concat("http://fluentlenium.com/path", "/abc/def");
+        Assertions.assertThat(test).isEqualTo("http://fluentlenium.com/path/abc/def");
     }
 
     @Test
     public void testBaseUrlWithPathWithTrailingSlashRootPath() {
-        String test = UrlUtils.concat("http://fluentlenium.org/path/", "/abc/def");
-        Assertions.assertThat(test).isEqualTo("http://fluentlenium.org/path/abc/def");
+        String test = UrlUtils.concat("http://fluentlenium.com/path/", "/abc/def");
+        Assertions.assertThat(test).isEqualTo("http://fluentlenium.com/path/abc/def");
     }
 
     @Test
@@ -60,8 +60,8 @@ public void testBaseUrlNullUrlDefined() {
 
     @Test
     public void testBaseUrlDefinedUrlNull() {
-        String test = UrlUtils.concat("http://fluentlenium.org/path/", null);
-        Assertions.assertThat(test).isEqualTo("http://fluentlenium.org/path/");
+        String test = UrlUtils.concat("http://fluentlenium.com/path/", null);
+        Assertions.assertThat(test).isEqualTo("http://fluentlenium.com/path/");
     }
 
     @Test
@@ -72,20 +72,20 @@ public void testBaseUrlNullUrlNull() {
 
     @Test
     public void testAbsoluteUrlReplaceBaseUrl() {
-        String test = UrlUtils.concat("http://fluentlenium.org/path/", "http://www.google.fr/test");
+        String test = UrlUtils.concat("http://fluentlenium.com/path/", "http://www.google.fr/test");
         Assertions.assertThat(test).isEqualTo("http://www.google.fr/test");
     }
 
     @Test
     public void testSanitizeBaseUrl() {
-        String baseUrl = UrlUtils.sanitizeBaseUrl("http://fluentlenium.org/path/", "https://fluentlenium.org/path/abc");
-        Assertions.assertThat(baseUrl).isEqualTo("https://fluentlenium.org/path/");
+        String baseUrl = UrlUtils.sanitizeBaseUrl("http://fluentlenium.com/path/", "https://fluentlenium.com/path/abc");
+        Assertions.assertThat(baseUrl).isEqualTo("https://fluentlenium.com/path/");
     }
 
     @Test
     public void testSanitizeBaseUrlOtherDomain() {
-        String baseUrl = UrlUtils.sanitizeBaseUrl("http://fluentlenium.org/path/", "https://www.google.com/path/abc");
-        Assertions.assertThat(baseUrl).isEqualTo("http://fluentlenium.org/path/");
+        String baseUrl = UrlUtils.sanitizeBaseUrl("http://fluentlenium.com/path/", "https://www.google.com/path/abc");
+        Assertions.assertThat(baseUrl).isEqualTo("http://fluentlenium.com/path/");
     }
 
     @Test
@@ -96,13 +96,13 @@ public void testSanitizeBaseUrlNull() {
 
     @Test
     public void testSanitizeBaseUrlMissingScheme() {
-        String baseUrl = UrlUtils.sanitizeBaseUrl("fluentlenium.org/path/", "https://fluentlenium.org/path/abc");
-        Assertions.assertThat(baseUrl).isEqualTo("https://fluentlenium.org/path/");
+        String baseUrl = UrlUtils.sanitizeBaseUrl("fluentlenium.com/path/", "https://fluentlenium.com/path/abc");
+        Assertions.assertThat(baseUrl).isEqualTo("https://fluentlenium.com/path/");
     }
 
     @Test
     public void testSanitizeBaseUrlMissingSchemeOtherDomain() {
-        String baseUrl = UrlUtils.sanitizeBaseUrl("fluentlenium.org/path/", "https://www.google.com/path/abc");
-        Assertions.assertThat(baseUrl).isEqualTo("http://fluentlenium.org/path/");
+        String baseUrl = UrlUtils.sanitizeBaseUrl("fluentlenium.com/path/", "https://www.google.com/path/abc");
+        Assertions.assertThat(baseUrl).isEqualTo("http://fluentlenium.com/path/");
     }
 }