Merge lp://staging/~abreu-alexandre/qtcreator-plugin-ubuntu/add-html5-tests-to-template into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Alexandre Abreu
Status: | Merged |
---|---|
Approved by: | Alexandre Abreu |
Approved revision: | 371 |
Merged at revision: | 387 |
Proposed branch: | lp://staging/~abreu-alexandre/qtcreator-plugin-ubuntu/add-html5-tests-to-template |
Merge into: | lp://staging/qtcreator-plugin-ubuntu |
Diff against target: |
4284 lines (+4140/-16) 18 files modified
debian/copyright (+21/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/Gruntfile.js (+12/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/README (+43/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/package.json (+13/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/__init__.py (+3/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/tests/__init__.py (+104/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/autopilot/application_tests/tests/test_app_launch.py (+19/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/specs/app-specs.js (+15/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/MIT.LICENSE (+20/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/boot.js (+121/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/console.js (+190/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine-html.js (+416/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine.css (+62/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/tests/unit/third_party/jasmine/lib/jasmine-2.2.0/jasmine.js (+3048/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml (+28/-10) share/qtcreator/templates/wizards/ubuntu/html5-simple/www/index.html (+2/-1) share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/application.js (+14/-0) share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/ui.js (+9/-5) |
To merge this branch: | bzr merge lp://staging/~abreu-alexandre/qtcreator-plugin-ubuntu/add-html5-tests-to-template |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zoltan Balogh | Approve | ||
Leo Arias (community) | Approve | ||
Nicholas Skaggs (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email:
|
Commit message
Add autopilot and unit tests templates for HTML5 simple application
Description of the change
Add autopilot and unit tests templates for HTML5 simple application
(Set as a WIP to view the diff)
To post a comment you must log in.
PASSED: Continuous integration, rev:368 jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- ci/527/ jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- vivid-amd64- ci/61 jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- vivid-armhf- ci/61
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtcreator- plugin- ubuntu- ci/527/ rebuild
http://