You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2015/01/22 01:38:59 UTC
ambari git commit: AMBARI-9164. RU repo version pattern adjustment.
(Richard Zang via yusaku):w
Repository: ambari
Updated Branches:
refs/heads/trunk aab897d57 -> e606c9d81
AMBARI-9164. RU repo version pattern adjustment. (Richard Zang via yusaku):w
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e606c9d8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e606c9d8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e606c9d8
Branch: refs/heads/trunk
Commit: e606c9d810ccdbaed2aeb9a1d065aea942c14512
Parents: aab897d
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Wed Jan 21 16:38:23 2015 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Wed Jan 21 16:38:23 2015 -0800
----------------------------------------------------------------------
.../stackVersions/StackVersionsCreateCtrl.js | 2 +-
.../StackVersionsCreateCtrl_test.js | 23 ++++++++++++--------
2 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e606c9d8/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
index a828086..64277ab 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
@@ -26,7 +26,7 @@ angular.module('ambariAdminConsole')
$scope.repoSubversion = "";
$scope.clusterName = $routeParams.clusterName;
- $scope.subversionPattern = /^\d(\.\d)?(\-\d*)?$/;
+ $scope.subversionPattern = /^\d+\.\d+(-\d+)?$/;
$scope.upgradeStack = {
selected: null,
options: []
http://git-wip-us.apache.org/repos/asf/ambari/blob/e606c9d8/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/stackVersions/StackVersionsCreateCtrl_test.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/stackVersions/StackVersionsCreateCtrl_test.js b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/stackVersions/StackVersionsCreateCtrl_test.js
index abae72a..81d3441 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/stackVersions/StackVersionsCreateCtrl_test.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/stackVersions/StackVersionsCreateCtrl_test.js
@@ -29,28 +29,33 @@ describe('#Cluster', function () {
describe('Test repository subversion input validation', function () {
it('1 digit', function() {
var input = "1";
- var invalidInput = "11";
+ var input2 = "11";
var regex = scope.subversionPattern;
- expect(regex.test(input)).toBe(true);
- expect(regex.test(invalidInput)).toBe(false);
+ expect(regex.test(input)).toBe(false);
+ expect(regex.test(input2)).toBe(false);
});
it('1 digit dot 1 digit', function() {
var input = "1.2";
- var invalidInput = "1.22";
+ var input2 = "1.22";
var regex = scope.subversionPattern;
expect(regex.test(input)).toBe(true);
- expect(regex.test(invalidInput)).toBe(false);
+ expect(regex.test(input2)).toBe(true);
});
- it('1 digit dot 1 digit dash 3 digits', function() {
- var input = "1.2-345";
- var invalidInput = "1.1-abc";
+ it('1 digit dot 1 digit dash 4 digits', function() {
+ var input = "1.2-3456";
+ var input2 = "1000.1000-12345";
+ var input3 = "1.1-123";
+ var invalidInput = "1.1-abcd";
+ var invalidInput2 = "1.2.3";
var regex = scope.subversionPattern;
expect(regex.test(input)).toBe(true);
+ expect(regex.test(input2)).toBe(true);
+ expect(regex.test(input3)).toBe(true);
expect(regex.test(invalidInput)).toBe(false);
+ expect(regex.test(invalidInput2)).toBe(false);
});
-
});
});
});