WIP: add E2E test suite unrelated to docs examples #9557
Conversation
caitp
force-pushed
the
issue-9527
branch
2 times, most recently
from
61d2143 to
a092380
Compare
|
So this is basically working --- the downside is that it makes the builds take significantly (~2min) longer. We can probably optimize this by keeping the SL connections alive, and only booting up one webserver to share for the two tasks. |
|
@juliemr could you review and help get this running a bit quicker? |
| ['webdriver', 'connect:testserver', 'protractor-docs:normal']); | ||
| grunt.registerTask('test:travis-protractor-docs', 'Run the end to end docs tests with Protractor for Travis CI builds', ['connect:testserver', 'protractor-docs:travis']); | ||
| grunt.registerTask('test:ci-protractor-docs', 'Run the end to end docs tests with Protractor for Jenkins CI builds', ['webdriver', 'connect:testserver', 'protractor-docs:jenkins']); | ||
| grunt.registerTask('test:docs-e2e', 'Alias for test:protractor', ['test:protractor-docs']); |
There was a problem hiding this comment.
should be 'Alias for test:protractor-docs'
|
I think you've got the right plan - I'm not sure why this needs to be in a different config file. Using the same one would get you the SL resuse and webserver reuse, and you can run subsets of the specs via the command line using |
| return next('Fixture ' + match[1] + ' not found.'); | ||
| } | ||
| } else if ((match = static_regexp.exec(basicUrl))) { | ||
| var rewritten = util.rewriteTestFile(match[1], match[2]); |
There was a problem hiding this comment.
I am not sure what base is used for, but it seems that rewriteTestFile will ignore it (and always use '/e2e').
(Haven't taken a proper look yet, so this might be intended.)
There was a problem hiding this comment.
This is intended.
There are two "base directories", one is the virtual root of E2E tests, and one is the root of the project tree. Static files are served relative to the root of the project tree, so we rewrite relative to that.
|
Is the point of this PR to allow us to write E2E tests that are not part of examples? If so, then how about we just use the infrastructure that is in dgeni (and the current AngularJS e2e test run) already to generate and execute the protractor tests by simply adding a new fileReader into the dgeni build that can read in new protractor tests from a separate folder, rather than extracting them from inline tags? It could generate any set of deployments you wish, including production CDN based ones. Am I missing something here? |
|
That would be more complicated --- I think using localhost:8000 as the baseUrl in all cases makes good sense though. It's really weird that anything in dgeni-packages needs to change to accommodate that, that's probably not a good sign. |
|
More complicated than what? |
|
Depending on code in a different repository, depending on code generation, etc --- it makes it all a lot harder to deal with imo |
|
The thing that had to change in dgeni is done. See angular/dgeni-packages@2bfb666 The problem was actually when generating protractor tests we had not accounted for the fact that we might want to specify the base url in which they live. It defaulted to the root, which was then accommodated in the protractor config. Now we can configure this inside the angular.js project to our heart's content. PR for this to follow. |
Updates to dgeni-packages 0.10.5 which supports this configurability. Change the dgeni config and protractor config so that we can have protractor tests that are hosted outside the build/docs folder. Provides support for angular#9557 (comment)
|
See #9680 |
petebacondarwin
force-pushed
the
master
branch
from
4dd5a20 to
998c61c
Compare
Updates to dgeni-packages 0.10.5 which supports this configurability. Change the dgeni config and protractor config so that we can have protractor tests that are hosted outside the build/docs folder. Provides support for #9557 (comment)
Due to the need to create a non-docs set of E2E tests, these are being moved. The old grunt commands will eventually be replaced with an alias which invokes both the simple E2E tests as well as the docs E2E tests.
It's tinier than jsdom, and seems to work okay for generating the fixtures.
This is a work in progress, still trying to make the server do everything it should do.
caitp
force-pushed
the
issue-9527
branch
2 times, most recently
from
af086ee to
3fbde1c
Compare
This is ongoing, bear with me while I hack on this :<