Skip to content

Commit e8c43fe

Browse files
committed
Add missing ids and adjust tests
1 parent 0fcffff commit e8c43fe

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

browser/directives/componentPanel.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
<div id="{{item.keyName}}-newer-warning" ng-show="item.option.detected.warning !== '' && item.selectedOption === 'detected'" class="has-warning">
1515
<div class="help-block">
1616
<span class="pficon pficon-warning-triangle-o"></span>
17-
<span>Newer than required!</span>
17+
<span id="{{item.keyName}}-newer-message">Newer than required!</span>
1818
</div>
1919
</div>
2020
<div id="{{item.keyName}}-older-warning" ng-show="item.option.detected.error !=='' && item.selectedOption === 'detected'" class="has-warning">
2121
<div class="help-block">
2222
<span class="pficon pficon-warning-triangle-o"></span>
23-
<span>Older than required!</span>
23+
<span id="{{item.keyName}}-older-message">Older than required!</span>
2424
</div>
2525
</div>
2626
</div>
2727
</div>
28-
<span id="{{item.keyName}}-name" class="product-name">{{item.productName}}</span><span id="{{item.keyName}-version" class="product-version">{{item.version}}</span>
28+
<span id="{{item.keyName}}-name" class="product-name">{{item.productName}}</span><span id="{{item.keyName}}-version" class="product-version">{{item.version}}</span>
2929
<div id="{{item.keyName}}-description">{{item.productDesc}}</div>
3030
</div>
3131
</div>

browser/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ let mainModule =
3535
.directive(breadcrumb.name, breadcrumb)
3636
.directive(pathValidator.name, pathValidator)
3737
.config( ['$stateProvider', '$urlRouterProvider', ($stateProvider, $urlRouterProvider) => {
38-
$urlRouterProvider.otherwise('/confirm');
38+
$urlRouterProvider.otherwise('/account');
3939
$stateProvider
4040
.state('account', {
4141
url: '/account',

test/ui/confirm-test.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ delete requirements.hyperv;
1818

1919
const messages = {
2020
detected: 'Using detected version',
21-
older: 'Older than recommended!',
22-
newer: 'Newer than recommended!'
21+
older: 'Older than required!',
22+
newer: 'Newer than required!'
2323
};
2424

2525
describe('Confirm page', function() {
@@ -63,7 +63,7 @@ describe('Confirm page', function() {
6363
requirements[key].installedNote = element(By.id(key + '-installed-note'));
6464
requirements[key].newerWarning = element(By.id(key + '-newer-warning'));
6565
requirements[key].newerMessage = element(By.id(key + '-newer-message'));
66-
requirements[key].olderError = element(By.id(key + '-older-error'));
66+
requirements[key].olderWarning = element(By.id(key + '-older-warning'));
6767
requirements[key].olderMessage = element(By.id(key + '-older-message'));
6868
}
6969
}
@@ -76,7 +76,7 @@ describe('Confirm page', function() {
7676

7777
//scoll down and select Java if it is deselected by default so that all panels appear on install screen
7878
afterAll(function() {
79-
let checkbox = requirements.jdk.panel.all(By.model('checkboxModel.jdk.selectedOption')).first();
79+
let checkbox = requirements.jdk.panel.all(By.model('item.selectedOption')).first();
8080
browser.executeScript('window.scrollTo(0,10000);').then(function() {
8181
return checkbox.isEnabled().then(function(enabled) {
8282
if (enabled) {
@@ -151,9 +151,9 @@ function testComponentPanel(key) {
151151
expect(component.newerMessage.getAttribute('innerHTML')).toEqual(messages.newer);
152152
});
153153

154-
it('older versions should come with an error', function() {
155-
expect(component.olderError.isPresent()).toBe(true);
156-
expect(component.olderError.getAttribute('class')).toMatch('has-error');
154+
it('older versions should come with a warning', function() {
155+
expect(component.olderWarning.isPresent()).toBe(true);
156+
expect(component.olderWarning.getAttribute('class')).toMatch('has-warning');
157157
expect(component.olderMessage.getAttribute('innerHTML')).toEqual(messages.older);
158158
});
159159
}

0 commit comments

Comments
 (0)