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
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: mp+255310@code.staging.launchpad.net

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.
368. By Alexandre Abreu

update copyright file

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Leo Arias (elopio) wrote :

This looks really good.

It would be awesome if we could integrate this with the make files, so we could run the tests locally with make test and make autopilot.

Also there are some changes needed to get this running with adt-run in a phone. You can copy most of the things from my branch to make them compatible with local and testbed executions: https://code.launchpad.net/~canonical-platform-qa/webapps-core/x-test/+merge/249580

Both things would be ok to do in future branches, to get this one landed quicker.

Some things to fix in the comments...

review: Needs Fixing
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

This is much improved on the default, thanks! I added some additional comments for cleanup.

Revision history for this message
Nicholas Skaggs (nskaggs) :
review: Needs Fixing
369. By Alexandre Abreu

oops forgot to add proper wizard.xml

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
370. By Alexandre Abreu

updates

Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

> Also there are some changes needed to get this running with adt-run in a
> phone. You can copy most of the things from my branch to make them compatible
> with local and testbed executions: https://code.launchpad.net/~canonical-
> platform-qa/webapps-core/x-test/+merge/249580

This is for html5 apps, do we need to make them "adt-run enabled" ?

Comments have been addressed

Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

Updated

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Leo Arias (elopio) wrote :

> > Also there are some changes needed to get this running with adt-run in a
> > phone. You can copy most of the things from my branch to make them
> compatible
> > with local and testbed executions: https://code.launchpad.net/~canonical-
> > platform-qa/webapps-core/x-test/+merge/249580
>
> This is for html5 apps, do we need to make them "adt-run enabled" ?
>
> Comments have been addressed

Yes, that would be lovely. But not necessarily on the same branch.

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Trying to run this as-is fails at first pass:

Unit
http://paste.ubuntu.com/10834284/

Autopilot
http://paste.ubuntu.com/10834211/

Going to play and see what I might be missing.

review: Needs Information
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Ok, seems you definitely need nodejs from upstream as the archive version is too old :-( I had success using nodejs 0.12.

I did get one warning.
npm WARN package.json my-app@0.1.0 No repository field.

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

So everything works for me on the unit test side; using nodejs from the archive. That's good to go.

On the autopilot side, the tests don't work as the port number isn't correct; the hardcoded port number is not the one the webview launches with.

review: Needs Fixing
371. By Alexandre Abreu

Fix env var setup

Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

> So everything works for me on the unit test side; using nodejs from the
> archive. That's good to go.
>
> On the autopilot side, the tests don't work as the port number isn't correct;
> the hardcoded port number is not the one the webview launches with.

I updated the AP code, there was an issue w/ env vars for the local IP devtools server not being set,

Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

> So everything works for me on the unit test side; using nodejs from the
> archive. That's good to go.
>
> On the autopilot side, the tests don't work as the port number isn't correct;
> the hardcoded port number is not the one the webview launches with.

I updated the AP code, there was an issue w/ env vars for the local IP devtools server not being set,

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Everything works, +1 from me.

review: Approve
Revision history for this message
Leo Arias (elopio) wrote :

If it works, I'm happy too. Lets get a review from zoltan or benjamin to get this landed.

review: Approve
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

Does it work on LTS/Utopic/Vivid?

Who maintains that python3-selenium package?

review: Needs Information
Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

> Does it work on LTS/Utopic/Vivid?

yes,

> Who maintains that python3-selenium package?

this is an upstream element packaged for our needs (removing some java deps),

Revision history for this message
Zoltan Balogh (bzoltan) wrote :

> > Does it work on LTS/Utopic/Vivid?
>
> yes,

In the PPA I see only Trusty and Vivid packages not Utopic. Many of the SDk users are not migrated from Utopic and we support Utopic for about a month after the Vivid release.

>
> > Who maintains that python3-selenium package?
>
> this is an upstream element packaged for our needs (removing some java deps),

I think the best would be to include this package to the SDK and publish it to 15.10 archive and to the SDK PPA.

I would suggest to change the vesrion umber of the package to show the target release. Like 2.4.4-0ubuntu1~0trusty1

I see that this big MR effects only the HTML5 template namespace + the license of the package with correct content. So it is good to go, but the python3-selenium should be productized and released in a proper way.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches