Skip to content
Extraits de code Groupes Projets
Valider 5197c586 rédigé par Thomas Steur's avatar Thomas Steur
Parcourir les fichiers

fixed some mentions of piwik-ui-tests repo which I just disabled on Travis

parent 0a18e197
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -99,7 +99,7 @@ We are grateful if you can share the Job Description with your friends and colle ...@@ -99,7 +99,7 @@ We are grateful if you can share the Job Description with your friends and colle
The Piwik project uses an ever-expanding comprehensive set of thousands of unit and integration tests and dozens of system [tests](https://github.com/piwik/piwik/tree/master/tests), The Piwik project uses an ever-expanding comprehensive set of thousands of unit and integration tests and dozens of system [tests](https://github.com/piwik/piwik/tree/master/tests),
running on the hosted distributed continuous integration platform Travis-CI. running on the hosted distributed continuous integration platform Travis-CI.
Build status (master branch) [![Build Status](https://travis-ci.org/piwik/piwik.svg?branch=master)](https://travis-ci.org/piwik/piwik) - Screenshot tests Build [![Build Status](https://travis-ci.org/piwik/piwik-ui-tests.svg?branch=master)](https://travis-ci.org/piwik/piwik-ui-tests) Build status (master branch) [![Build Status](https://travis-ci.org/piwik/piwik.svg?branch=master)](https://travis-ci.org/piwik/piwik)
Code Coverage: [![Code Coverage](https://scrutinizer-ci.com/g/piwik/piwik/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/piwik/piwik/?branch=master) Code Coverage: [![Code Coverage](https://scrutinizer-ci.com/g/piwik/piwik/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/piwik/piwik/?branch=master)
......
...@@ -18,7 +18,7 @@ then you should update the expected screenshots accordingly. ...@@ -18,7 +18,7 @@ then you should update the expected screenshots accordingly.
To fix a broken build, follow these steps: To fix a broken build, follow these steps:
* Go to the UI tests travis build: [https://travis-ci.org/piwik/piwik-ui-tests](https://travis-ci.org/piwik/piwik-ui-tests) * Go to the Tests travis build: [https://travis-ci.org/piwik/piwik](https://travis-ci.org/piwik/piwik) and select the build containing `TEST_SUITE=UITests`
* Find the build you are interested in. The UI tests build will be run for each commit in each branch, so if you're * Find the build you are interested in. The UI tests build will be run for each commit in each branch, so if you're
looking to resolve a specific failure, you'll have to find the build for the commit you've made. looking to resolve a specific failure, you'll have to find the build for the commit you've made.
* In the build output, at the beginning of the test output, there will be a link to a image diff viewer. It will look something * In the build output, at the beginning of the test output, there will be a link to a image diff viewer. It will look something
...@@ -38,7 +38,7 @@ To fix a broken build, follow these steps: ...@@ -38,7 +38,7 @@ To fix a broken build, follow these steps:
_Note: When determining whether a screenshot is correct, the data displayed is not important. Report data correctness is verified through System and other PHP tests. The UI tests should only test UI behavior._ _Note: When determining whether a screenshot is correct, the data displayed is not important. Report data correctness is verified through System and other PHP tests. The UI tests should only test UI behavior._
* Push the changes (to your code and/or to the expected-ui-screenshots directory. * Push the changes (to your code and/or to the expected-ui-screenshots directory.
* Wait for next UI Tests build [on travis](https://travis-ci.org/piwik/piwik-ui-tests). Hopefully, the build should be green! * Wait for next Test build [on travis](https://travis-ci.org/piwik/piwik). Hopefully, the build should be green!
_Note: the **development:sync-ui-test-screenshots** console command can be used to speed up the process. Run **./console help development:sync-ui-test-screenshots** to learn more._ _Note: the **development:sync-ui-test-screenshots** console command can be used to speed up the process. Run **./console help development:sync-ui-test-screenshots** to learn more._
...@@ -110,7 +110,7 @@ The following options may be useful if you plan on running the UI tests locally ...@@ -110,7 +110,7 @@ The following options may be useful if you plan on running the UI tests locally
UI screenshot tests are run directly by phantomjs and are written using [mocha](http://visionmedia.github.io/mocha/) and [chai](http://chaijs.com). UI screenshot tests are run directly by phantomjs and are written using [mocha](http://visionmedia.github.io/mocha/) and [chai](http://chaijs.com).
To create a new test, first decide whether it will belong to Piwik Core or a plugin. If it will belong to Piwik Core, the test should be placed within the [piwik-ui-tests](https://github.com/piwik/piwik-ui-tests) repository. Otherwise, it should be placed within tests/UI sub-directory of your plugin. To create a new test, first decide whether it will belong to Piwik Core or a plugin. If it will belong to Piwik Core, the test should be placed within the `/tests/UI` directory. Otherwise, it should be placed within `tests/UI sub-directory of your plugin.
All test files should have \_spec.js file name suffixes (for example, **ActionsDataTable\_spec.js**). All test files should have \_spec.js file name suffixes (for example, **ActionsDataTable\_spec.js**).
...@@ -230,9 +230,9 @@ _Note: the Piwik environment is not initialized when the **TestingEnvironment.ad ...@@ -230,9 +230,9 @@ _Note: the Piwik environment is not initialized when the **TestingEnvironment.ad
The following are examples of test environment manipulation: The following are examples of test environment manipulation:
* [Overlay_spec.js](https://github.com/piwik/piwik-ui-tests/blob/master/specs/Overlay_spec.js) * [Overlay_spec.js](https://github.com/piwik/piwik/blob/master/tests/UI/specs/Overlay_spec.js)
* [Dashboard_spec.js](https://github.com/piwik/piwik-ui-tests/blob/master/specs/Dashboard_spec.js) * [Dashboard_spec.js](https://github.com/piwik/piwik/blob/master/tests/UI/specs/Dashboard_spec.js)
* [Login_spec.js](https://github.com/piwik/piwik-ui-tests/blob/master/specs/Login_spec.js) * [Login_spec.js](https://github.com/piwik/piwik/blob/master/tests/UI/specs/Login_spec.js)
## Learn more ## Learn more
......
...@@ -34,7 +34,7 @@ function compareImages(expected, expectedGithub, processed) ...@@ -34,7 +34,7 @@ function compareImages(expected, expectedGithub, processed)
$('.processed').attr('src', encodeURI(processed)); $('.processed').attr('src', encodeURI(processed));
$('.expected').attr('src', encodeURI(expected)); $('.expected').attr('src', encodeURI(expected));
$('.expectedGithub').attr('src', 'https://raw.githubusercontent.com/piwik/piwik-ui-tests/master/expected-ui-screenshots/' + encodeURI(expectedGithub)); $('.expectedGithub').attr('src', 'https://raw.githubusercontent.com/piwik/piwik-ui-tests/master/' + encodeURI(expectedGithub));
} }
function getUrlQueryParam(sParam) { function getUrlQueryParam(sParam) {
......
...@@ -21,7 +21,7 @@ DiffViewerGenerator.prototype.getDiffPath = function (testInfo) { ...@@ -21,7 +21,7 @@ DiffViewerGenerator.prototype.getDiffPath = function (testInfo) {
return path.resolve(path.join(baseDir, config.screenshotDiffDir, testInfo.name + '.png')); return path.resolve(path.join(baseDir, config.screenshotDiffDir, testInfo.name + '.png'));
}; };
// TODO: diff output path shouldn't be stored in piwik-ui-tests repo // TODO: diff output path shouldn't be stored in piwik repo
DiffViewerGenerator.prototype.getUrlForPath = function (path) { DiffViewerGenerator.prototype.getUrlForPath = function (path) {
return fs.relpath(path, this.diffDir); return fs.relpath(path, this.diffDir);
}; };
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter