[Time Conductor] Test restoration of old values

...and clarify name of the function in scope which does this.
This commit is contained in:
Victor Woeltjen 2015-11-27 14:23:25 -08:00
parent 02050fa3ef
commit 248bc68f0d
3 changed files with 10 additions and 4 deletions
platform/commonUI/general
res/templates/controls
src/controllers
test/controllers

View File

@ -23,7 +23,7 @@
ng-controller="DateTimeFieldController">
<input type="text"
ng-model="textValue"
ng-blur="restoreValue(); ngBlur()"
ng-blur="restoreTextValue(); ngBlur()"
ng-class="{ error: textInvalid }">
</input>
<a class="ui-symbol icon icon-calendar"

View File

@ -82,12 +82,12 @@ define(
updateFromModel($scope.ngModel[$scope.field]);
}
function restoreValue() {
function restoreTextValue() {
$scope.textValue = $scope.lastValidValue;
updateFromView($scope.textValue);
}
$scope.restoreValue = restoreValue;
$scope.restoreTextValue = restoreTextValue;
$scope.picker = { active: false };

View File

@ -126,11 +126,12 @@ define(
});
describe("when user input is invalid", function () {
var newText, oldValue;
var newText, oldText, oldValue;
beforeEach(function () {
newText = "Not a date";
oldValue = mockScope.ngModel.testField;
oldText = mockScope.textValue;
mockScope.textValue = newText;
fireWatch("textValue", newText);
});
@ -146,6 +147,11 @@ define(
it("does not modify user input", function () {
expect(mockScope.textValue).toEqual(newText);
});
it("restores valid text values on request", function () {
mockScope.restoreTextValue();
expect(mockScope.textValue).toEqual(oldText);
});
});
it("does not modify valid but irregular user input", function () {