Merge branch 'fix-test' into develop

Author: baymac

pom.xml

@@ -78,6 +78,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.jcabi</groupId>
+            <artifactId>jcabi-matchers</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.jenkins</groupId>
             <artifactId>configuration-as-code</artifactId>

src/test/java/io/jenkins/plugins/gitlabserverconfig/casc/ConfigurationAsCodeTest.java

@@ -15,6 +15,7 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 
+import static com.jcabi.matchers.RegexMatchers.matchesPattern;
 import static io.jenkins.plugins.casc.misc.Util.getUnclassifiedRoot;
 import static io.jenkins.plugins.casc.misc.Util.toStringFromYamlFile;
 import static io.jenkins.plugins.casc.misc.Util.toYamlString;
@@ -35,7 +36,7 @@ public void should_support_configuration_as_code() {
         assertThat(servers.size(), is(1));
         GitLabServer server = servers.get(0);
         assertThat(server.getServerUrl(), is("https://gitlab.com"));
-        assertThat(server.getName(), is("gitlab.com"));
+        assertThat(server.getName(), matchesPattern("gitlab-[0-9]{4}"));
         assertThat(server.isManageHooks(), is(true));
 
         List<PersonalAccessTokenImpl> credentials = CredentialsProvider.lookupCredentials(
@@ -58,6 +59,6 @@ public void should_support_configuration_export() throws Exception {
 
         String expected = toStringFromYamlFile(this, "expected_output.yml");
 
-        assertThat(exported, is(expected));
+        assertThat(exported, matchesPattern(expected));
     }
 }

src/test/resources/io/jenkins/plugins/gitlabserverconfig/casc/configuration-as-code.yml

@@ -12,5 +12,4 @@ unclassified:
     servers:
       - credentialsId: "i<3GitLab"
         manageHooks: true
-        name: "gitlab.com"
         serverUrl: "https://gitlab.com"

src/test/resources/io/jenkins/plugins/gitlabserverconfig/casc/expected_output.yml

@@ -1,5 +1,5 @@
 servers:
 - credentialsId: "i<3GitLab"
   manageHooks: true
-  name: "gitlab.com"
+  name: "gitlab-[0-9]{4}"
   serverUrl: "https://gitlab.com"