Skip to content

Commit e7049e5

Browse files
jcenturionjcenturion
committed
Merge pull request #119 from mulesoft/fixing-automation-tests
Fix automation tests
2 parents 510c5d8 + 6e3d21b commit e7049e5

29 files changed

+391
-248
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ node_js:
55
before_script:
66
- npm install -g grunt-cli
77
- npm install -g bower
8+
- npm install -g protractor
9+
- npm update
810
- bower update
11+
- node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update
912
before_install:
1013
- "export DISPLAY=:99.0"
1114
- "sh -e /etc/init.d/xvfb start"
@@ -19,7 +22,7 @@ after_success:
1922
- ssh ${ACCEPTANCE_USER}@${ACCEPTANCE_HOST} mkdir -p ${DIST_DIR}
2023
- scp -r dist/* ${ACCEPTANCE_USER}@${ACCEPTANCE_HOST}:${DIST_DIR}/
2124
addons:
22-
firefox: "27.0"
25+
firefox: "36.0"
2326
env:
2427
global:
2528
- secure: M7tZ5uMFAPBNkzNuD0HF9PxeoH3Q9gMsvOCheQd5WCxxcSQwGsw8naErJshXYdAvFLsuTYT0MfHYt/TfcoEHfrykK5GiGaaSQB0MQtDWokQPHUl3S8Cjjh8+Aj3V/J+yyEFZ7AY9PvoSnHdeEuZfAYO/tuj9IBmC9tsbV5K5hX4=

‎Gruntfile.js‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,27 @@ module.exports = function (grunt) {
4949

5050
livereload: {
5151
options: {
52-
livereload: true,
53-
open: true,
52+
livereload: true,
53+
open: true,
5454
middleware: function (connect) {
5555
return [
5656
connect.static('dist')
5757
];
5858
}
5959
}
60+
},
61+
62+
regression: {
63+
options: {
64+
livereload: true,
65+
open: false,
66+
middleware: function (connect) {
67+
return [
68+
connect.static('dist'),
69+
connect.static('test/regression/assets'),
70+
];
71+
}
72+
}
6073
}
6174
},
6275

@@ -273,14 +286,7 @@ module.exports = function (grunt) {
273286

274287
protractor: {
275288
options: {
276-
configFile: 'test/regression/protractor.conf.js',
277-
keepAlive: false,
278-
args: {
279-
browser: process.env.TRAVIS ? 'firefox' : 'chrome'
280-
}
281-
},
282-
283-
regression: {
289+
keepAlive: false
284290
},
285291

286292
local: {
@@ -315,7 +321,7 @@ module.exports = function (grunt) {
315321
]);
316322

317323
grunt.registerTask('regression', [
318-
'build',
324+
'connect:regression',
319325
'protractor:local'
320326
]);
321327
};

‎dist/scripts/api-console.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,20 +405,24 @@
405405
return jQuery.trim(path.toString().replace(/\W/g, ' ')).replace(/\s+/g, '_');
406406
};
407407

408-
var $inactiveElements = jQuery('.raml-console-tab').add('.raml-console-resource').add('li');
408+
var $inactiveElements = jQuery('.raml-console-tab').add('.raml-console-resource')
409+
.add('li')
410+
.add('.raml-console-tab');
409411

410412
$scope.$on('openMethod', function(event, $currentScope) {
411413
if ($scope.$id !== $currentScope.$id) {
412-
$inactiveElements.removeClass('is-active');
414+
$inactiveElements.removeClass('raml-console-is-active');
413415
$scope.showPanel = false;
414416
}
415417
});
416418

417419
$scope.showResource = function ($event, $index) {
418420
var $this = jQuery($event.currentTarget);
419421
var $resource = $this.closest('.raml-console-resource');
420-
var $inactiveElements = jQuery('.raml-console-tab').add('.raml-console-resource').add('li');
421422
var methodInfo = $scope.resource.methods[$index];
423+
var $inactiveElements = jQuery('.raml-console-tab').add('.raml-console-resource')
424+
.add('li')
425+
.add('.raml-console-tab');
422426

423427
$scope.methodInfo = methodInfo;
424428
$scope.responseInfo = getResponseInfo();

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Api-Console for RAML based app",
55
"main": "index.js",
66
"scripts": {
7-
"test": "grunt test"
7+
"test": "grunt regression"
88
},
99
"repository": {
1010
"type": "git",

‎src/app/directives/method-list.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,24 @@
7777
return jQuery.trim(path.toString().replace(/\W/g, ' ')).replace(/\s+/g, '_');
7878
};
7979

80-
var $inactiveElements = jQuery('.raml-console-tab').add('.raml-console-resource').add('li');
80+
var $inactiveElements = jQuery('.raml-console-tab').add('.raml-console-resource')
81+
.add('li')
82+
.add('.raml-console-tab');
8183

8284
$scope.$on('openMethod', function(event, $currentScope) {
8385
if ($scope.$id !== $currentScope.$id) {
84-
$inactiveElements.removeClass('is-active');
86+
$inactiveElements.removeClass('raml-console-is-active');
8587
$scope.showPanel = false;
8688
}
8789
});
8890

8991
$scope.showResource = function ($event, $index) {
9092
var $this = jQuery($event.currentTarget);
9193
var $resource = $this.closest('.raml-console-resource');
92-
var $inactiveElements = jQuery('.raml-console-tab').add('.raml-console-resource').add('li');
9394
var methodInfo = $scope.resource.methods[$index];
95+
var $inactiveElements = jQuery('.raml-console-tab').add('.raml-console-resource')
96+
.add('li')
97+
.add('.raml-console-tab');
9498

9599
$scope.methodInfo = methodInfo;
96100
$scope.responseInfo = getResponseInfo();

‎test/regression/assertions/displaySettings.js‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
'use strict';
2+
3+
var factory = require('../page_objects');
4+
5+
function DisplaySettings (poName) {
6+
this.po = factory.create(poName);
7+
8+
this.ifThemeSwitcherIsDisabled = function () {
9+
expect(this.po.count()).toBe(1);
10+
this.po.getButtonAt(0).then(function (value) {
11+
expect(value.trim()).toBe('Download API Client');
12+
});
13+
};
14+
15+
this.ifDownloadApiClientIsDisabled = function () {
16+
expect(this.po.count()).toBe(1);
17+
this.po.getButtonAt(0).then(function (value) {
18+
expect(value.trim()).toBe('Switch Theme');
19+
});
20+
};
21+
22+
this.ifMetaButtonGroupIsDisabled = function () {
23+
expect(this.po.count()).toBe(0);
24+
};
25+
26+
this.ifTitleIsDisabled = function () {
27+
expect(this.po.title.isPresent()).toBe(false);
28+
};
29+
30+
this.ifDisplayingInSingleViewMode = function () {
31+
var button = this.po.getMethodButton();
32+
33+
button.click();
34+
35+
expect(this.po.getCollepsedForm().isPresent()).toBe(true);
36+
};
37+
38+
this.ifResourcesAreCollapsed = function () {
39+
expect(this.po.resourceToggler.getAttribute('class')).toContain('raml-console-is-active');
40+
};
41+
}
42+
43+
module.exports = DisplaySettings;

‎test/regression/assertions/resource.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function Resource (poName) {
4646

4747
securitySchemesCount.then(function (count) {
4848
for (var i = 0; i < count; i++) {
49-
expect(schemes.get(i).getText()).toBe(expectedSchemes[i]);
49+
expect(schemes.get(i).getInnerHtml()).toBe(expectedSchemes[i]);
5050
}
5151
});
5252
};

‎test/regression/assets/directive-all-methods.html‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1">
6+
<title>API Console</title>
7+
<link href="styles/api-console-light-theme.css" rel="stylesheet" class="theme">
8+
</head>
9+
<body ng-app="ramlConsoleApp" ng-cloak class="raml-console-body">
10+
<raml-console src="raml/all-methods.raml"></raml-console>
11+
<script src="scripts/api-console-vendor.js"></script>
12+
<script src="scripts/api-console.js"></script>
13+
<script type="text/javascript">
14+
$.noConflict();
15+
</script>
16+
</body>
17+
</html>

‎test/regression/assets/directive-minimum.html‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1">
6+
<title>API Console</title>
7+
<link href="styles/api-console-light-theme.css" rel="stylesheet" class="theme">
8+
</head>
9+
<body ng-app="ramlConsoleApp" ng-cloak class="raml-console-body">
10+
<raml-console src="raml/minimum.raml"></raml-console>
11+
<script src="scripts/api-console-vendor.js"></script>
12+
<script src="scripts/api-console.js"></script>
13+
<script type="text/javascript">
14+
$.noConflict();
15+
</script>
16+
</body>
17+
</html>

‎test/regression/assets/directive-resources.html‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1">
6+
<title>API Console</title>
7+
<link href="styles/api-console-light-theme.css" rel="stylesheet" class="theme">
8+
</head>
9+
<body ng-app="ramlConsoleApp" ng-cloak class="raml-console-body">
10+
<raml-console src="raml/resources.raml"></raml-console>
11+
<script src="scripts/api-console-vendor.js"></script>
12+
<script src="scripts/api-console.js"></script>
13+
<script type="text/javascript">
14+
$.noConflict();
15+
</script>
16+
</body>
17+
</html>

0 commit comments

Comments
 (0)