Skip to content
This repository was archived by the owner on Apr 4, 2025. It is now read-only.

Commit 14efe03

Browse files
chore(e2e): tidy up tests and config
1 parent f31012d commit 14efe03

File tree

2 files changed

+30
-39
lines changed

2 files changed

+30
-39
lines changed

protractorConf.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,5 @@ exports.config = {
66
directConnect: true,
77
specs: [
88
'test/angularjs.org.spec.js',
9-
],
10-
jasmineNodeOpts: {
11-
onComplete: null,
12-
isVerbose: true,
13-
showColors: false,
14-
includeStackTrace: true,
15-
defaultTimeoutInterval: 10000
16-
}
9+
]
1710
};

test/angularjs.org.spec.js

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
describe('Angularjs.org', function () {
2-
var protractor = require('protractor')
3-
, protractorConfig = require('../protractorConf.js')
4-
, webdriver = require('selenium-webdriver');
2+
var webdriver = require('selenium-webdriver');
53

64
describe('App', function () {
75
beforeEach(function () {
@@ -12,14 +10,14 @@ describe('Angularjs.org', function () {
1210
it('should have the correct version of angularjs loaded', function() {
1311
//This only runs if an environment variable tells us to check
1412
if (process.env.CHECK_SCRIPT_TAG !== 'true') return;
15-
var scriptTag = browser.findElement(protractor.By.css('script#angularScript'));
13+
var scriptTag = browser.findElement(by.css('script#angularScript'));
1614
expect(scriptTag.getAttribute('src')).
1715
toContain(process.env.ANGULAR_VERSION);
1816
});
1917

2018

2119
it('should load the web page', function () {
22-
var body = browser.findElement(protractor.By.css('body'));
20+
var body = browser.findElement(by.css('body'));
2321
expect(body.getAttribute('ng-controller')).toEqual('AppController');
2422
});
2523

@@ -29,25 +27,25 @@ describe('Angularjs.org', function () {
2927
downloadVersions = process.env.ANGULAR_DOWNLOAD_VERSIONS.split(' ');
3028

3129
beforeEach(function () {
32-
var downloadBtn = browser.findElement(protractor.By.css('.download-btn')), done;
30+
var downloadBtn = browser.findElement(by.css('.download-btn')), done;
3331
downloadBtn.click();
3432
browser.driver.sleep(500);
35-
cdnInput = browser.findElement(protractor.By.css('#cdnURL'));
33+
cdnInput = browser.findElement(by.css('#cdnURL'));
3634
cdnInput.getAttribute('value');
3735
cdnInput.getText().then(function (text) {
3836
stableVersion = text.toString().split('/').splice(-2,1)[0];
3937
});
4038
});
4139

4240
it('should open a modal prompting for download configuration', function () {
43-
var downloadModal = browser.findElement(protractor.By.css('.download-modal'))
41+
var downloadModal = browser.findElement(by.css('.download-modal'))
4442
expect(downloadModal.getCssValue('display')).toEqual('block');
4543
});
4644

4745

4846
it('should change the CDN url based on user selection of stable or unstable', function () {
4947
var okay;
50-
var unstableButton = browser.findElement(protractor.By.css(".branch-btns button:nth-child(1)"));
48+
var unstableButton = browser.findElement(by.css(".branch-btns button:nth-child(1)"));
5149
browser.driver.sleep(500);
5250
unstableButton.click();
5351
cdnInput.getAttribute('value').then(function (val) {
@@ -71,7 +69,7 @@ describe('Angularjs.org', function () {
7169
replace(/\*/g, 'x'),
7270

7371
branchBtn = browser.findElement(
74-
protractor.By.css(branchBtnSelector));
72+
by.css(branchBtnSelector));
7573
branchBtn.click();
7674

7775
expect(cdnInput.getAttribute('value')).
@@ -82,7 +80,7 @@ describe('Angularjs.org', function () {
8280

8381
it('should allow downloading uncompressed angular', function () {
8482
var uncompressedBtn = browser.findElement(
85-
protractor.By.css(
83+
by.css(
8684
'.download-modal .modal-body > dl button.uncompressed'));
8785
uncompressedBtn.click();
8886

@@ -91,7 +89,7 @@ describe('Angularjs.org', function () {
9189

9290

9391
it('should have a working close button', function () {
94-
var closeButton = browser.findElement(protractor.By.css('.download-modal .modal-header button.close'));
92+
var closeButton = browser.findElement(by.css('.download-modal .modal-header button.close'));
9593
closeButton.click();
9694
expect(element(by.css('.download-modal')).isPresent()).toBe(false);
9795
});
@@ -100,10 +98,10 @@ describe('Angularjs.org', function () {
10098
['Branches', 'Builds', 'Why Google CDN?','What is Bower?'].forEach(function(value) {
10199

102100
it('should be displayed for ' + value, function () {
103-
var popoverButton = browser.findElement(protractor.By.css('.download-modal [popover-title="'+value+'"]'));
101+
var popoverButton = browser.findElement(by.css('.download-modal [popover-title="'+value+'"]'));
104102
popoverButton.click();
105103

106-
var popover = browser.findElement(protractor.By.css('.popover'));
104+
var popover = browser.findElement(by.css('.popover'));
107105
expect(popover.getCssValue('display')).toEqual('block');
108106
});
109107

@@ -115,62 +113,62 @@ describe('Angularjs.org', function () {
115113

116114
describe('The Basics', function () {
117115
it('should show the code example', function () {
118-
var hello = browser.findElement(protractor.By.css('[app-source="hello.html"]'));
116+
var hello = browser.findElement(by.css('[app-source="hello.html"]'));
119117
expect(hello.getText()).toContain('{{yourName}}');
120118
});
121119

122120

123121
it('should have a hoverable region called ng-app', function () {
124-
var noCode = browser.findElement(protractor.By.css('[popover-title="ng-app"]'))
122+
var noCode = browser.findElement(by.css('[popover-title="ng-app"]'))
125123
expect(noCode.getText()).toEqual('ng-app');
126124
});
127125

128126

129127
it('should update the Hello text after entering a name', function () {
130-
var el = browser.findElement(protractor.By.model('yourName'));
128+
var el = browser.findElement(by.model('yourName'));
131129
el.click()
132130
el.sendKeys('Jeff')
133131

134-
var bound = browser.findElement(protractor.By.css('[app-run="hello.html"] h1'));
132+
var bound = browser.findElement(by.css('[app-run="hello.html"] h1'));
135133
expect(bound.getText()).toEqual('Hello Jeff!');
136134
});
137135
});
138136

139137

140138
describe('Add Some Control', function () {
141139
it('should strike out a todo when clicked', function () {
142-
var el = browser.findElement(protractor.By.css('[ng-controller="TodoListController as todoList"] ul >li:nth-child(2) input'));
140+
var el = browser.findElement(by.css('[ng-controller="TodoListController as todoList"] ul >li:nth-child(2) input'));
143141
el.click();
144142
expect(el.getAttribute('value')).toBe('on');
145143
});
146144

147145

148146
it('should add a new todo when added through text field', function () {
149-
var el = browser.findElement(protractor.By.model('todoList.todoText'));
147+
var el = browser.findElement(by.model('todoList.todoText'));
150148
el.click();
151149
el.sendKeys('Write tests!');
152150
el.sendKeys(webdriver.Key.RETURN);
153-
var lastTodo = browser.findElement(protractor.By.css('[ng-repeat="todo in todoList.todos"]:nth-child(3) span'));
151+
var lastTodo = browser.findElement(by.css('[ng-repeat="todo in todoList.todos"]:nth-child(3) span'));
154152
expect(lastTodo.getText()).toEqual('Write tests!');
155153
});
156154

157155

158156
it('should show a secondary tab when selected', function () {
159-
var todoJsTab = browser.findElement(protractor.By.css('[annotate="todo.annotation"] ul.nav-tabs li:nth-child(2) a'));
157+
var todoJsTab = browser.findElement(by.css('[annotate="todo.annotation"] ul.nav-tabs li:nth-child(2) a'));
160158
todoJsTab.click()
161159
browser.driver.sleep(500);
162-
var todojs = browser.findElement(protractor.By.css('[annotate="todo.annotation"] .tab-pane:nth-child(2)'));
160+
var todojs = browser.findElement(by.css('[annotate="todo.annotation"] .tab-pane:nth-child(2)'));
163161
expect(todojs.getCssValue('display')).toEqual('block');
164162
});
165163
});
166164

167165

168166
describe('Wire up a Backend', function () {
169167
it('should show a secondary tab when selected', function () {
170-
var listBtn = browser.findElement(protractor.By.css('[annotate="project.annotation"] ul.nav-tabs li:nth-child(2) a'));
168+
var listBtn = browser.findElement(by.css('[annotate="project.annotation"] ul.nav-tabs li:nth-child(2) a'));
171169
listBtn.click();
172170
browser.driver.sleep(500);
173-
var listTab = browser.findElement(protractor.By.css('[module="project"] .tab-pane:nth-child(2)'));
171+
var listTab = browser.findElement(by.css('[module="project"] .tab-pane:nth-child(2)'));
174172
expect(listTab.getCssValue('display')).toEqual('block');
175173
});
176174

@@ -190,35 +188,35 @@ describe('Angularjs.org', function () {
190188

191189
describe('Create Components', function () {
192190
it('should show the US localization of date', function () {
193-
var dateText = browser.findElement(protractor.By.css('[module="app-us"] .tab-content > .tab-pane > span:first-child'));
191+
var dateText = browser.findElement(by.css('[module="app-us"] .tab-content > .tab-pane > span:first-child'));
194192
var text = dateText.getText();
195193

196194
expect(text).toMatch(/^Date: [A-Za-z]*, [A-Za-z]+ [0-9]{1,2}, [0-9]{4}$/);
197195
});
198196

199197

200198
/*it('should show the US pluralization of beer', function () {
201-
var pluralTabLink = browser.findElement(protractor.By.css('[module="app-us"] .nav-tabs > li:nth-child(2) a'));
199+
var pluralTabLink = browser.findElement(by.css('[module="app-us"] .nav-tabs > li:nth-child(2) a'));
202200
pluralTabLink.click()
203201
204-
var pluralTab = browser.findElement(protractor.By.css('[module="app-us"] [ng-controller="BeerCounter"] > div > ng-pluralize'));
202+
var pluralTab = browser.findElement(by.css('[module="app-us"] [ng-controller="BeerCounter"] > div > ng-pluralize'));
205203
expect(pluralTab.getText()).toEqual('no beers');
206204
});
207205
208206
209207
it('should show the Slovak pluralization of beer', function () {
210-
var pluralTabLink = browser.findElement(protractor.By.css('[module="app-sk"] .nav-tabs > li:nth-child(2) a'));
208+
var pluralTabLink = browser.findElement(by.css('[module="app-sk"] .nav-tabs > li:nth-child(2) a'));
211209
pluralTabLink.click();
212210
213-
var pluralTab = browser.findElement(protractor.By.css('[module="app-sk"] [ng-controller="BeerCounter"] > div > ng-pluralize'));
211+
var pluralTab = browser.findElement(by.css('[module="app-sk"] [ng-controller="BeerCounter"] > div > ng-pluralize'));
214212
expect(pluralTab.getText()).toEqual('žiadne pivo');
215213
});*/
216214
});
217215

218216

219217
describe('Testability Built-in', function () {
220218
it('should have some content under and "Testability Built-in" heading', function () {
221-
var testability = browser.findElement(protractor.By.css('#testability'))
219+
var testability = browser.findElement(by.css('#testability'))
222220
expect(testability.getText()).toEqual('Testability Built-in');
223221
});
224222
});

0 commit comments

Comments
 (0)