From c22403d0f98ee6755a8d4394b6a57ae45bc8d655 Mon Sep 17 00:00:00 2001 From: Tom Fennelly Date: Fri, 1 Apr 2016 13:55:51 +0100 Subject: [PATCH] Temp v2 version check with TODO for post 2.0 release The fact that it's a beta release means it is older than version "2" for the VersionNumber class. --- .../org/jenkinsci/test/acceptance/po/ToolInstallation.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/ToolInstallation.java b/src/main/java/org/jenkinsci/test/acceptance/po/ToolInstallation.java index 0d36e080ba..036e734924 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/po/ToolInstallation.java +++ b/src/main/java/org/jenkinsci/test/acceptance/po/ToolInstallation.java @@ -95,7 +95,10 @@ public ToolInstallation(Jenkins jenkins, String path) { } protected static ConfigurablePageObject getPageObject(Jenkins jenkins) { - return jenkins.getVersion().isOlderThan(new VersionNumber("2")) + // TODO: change to jenkins.getVersion().isOlderThan(new VersionNumber("2")) after 2.0 is released. + // yeah, you could do a number of things here e.g. isNewerThan("1.1000") etc, + // but this is fine as it's temporary. + return jenkins.getVersion().toString().startsWith("1.") ? new JenkinsConfig(jenkins) : new GlobalToolConfig(jenkins); }