Merge pull request #1793 from anotherchrisberry/omg-regions

fix initial selection on regionSelectField

app/scripts/modules/core/region/regionSelectField.directive.html

@@ -7,7 +7,7 @@
  ng-model="component[field]"
  ng-change="onChange()"
  required>
- <option ng-repeat="region in regions" value="{{region.name}}" ng-selected="component[field] === region">{{region.name}}</option>
+ <option ng-repeat="region in regions" value="{{region.name}}" ng-selected="component[field] === region.name">{{region.name}}</option>
  </select>
  <p ng-if="readOnly" class="form-control-static">{{component[field]}}</p>
  </div>

app/scripts/modules/core/region/regionSelectField.directive.spec.js

@@ -66,4 +66,21 @@ describe('Directives: regionSelectField', function () {
  expect(option.value).toBe(expected[idx]);
  });
  });
+
+ it('selects correct initial value', function () {
+ var scope = this.scope;
+
+ scope.regions = [{name: 'us-east-1'}, {name: 'us-west-1'}];
+
+ scope.model = { regionField: 'us-west-1', accountField: 'a'};
+
+ var html = '<region-select-field regions="regions" component="model" field="regionField" account="model.accountField" provider="\'aws\'" label-columns="2"></region-select-field>';
+
+ var elem = this.compile(html)(scope);
+ scope.$digest();
+
+ var options = elem.find('option');
+ expect(options[1].selected).toBe(true);
+
+ });
 });