Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update jasmine to 2.0.2 #409

Merged
merged 3 commits into from Jun 2, 2014
Merged

Update jasmine to 2.0.2 #409

merged 3 commits into from Jun 2, 2014

Conversation

QuantumCatgirl
Copy link
Contributor

Also cleaned up the jasmine environment. Jasmine 2 uses phantomjs
instead of selenium-webdriver and so is jenkins-friendly. It's now possible
to use the asset pipeline to include source assets instead of having to
maintain a list in jasmine.yml.

JS unit tests do not pass (and didn't before this change). I'm going to make
a second pull request to fix the tests I can and remove those I can't.

#
#Example: prevent PhantomJS auto install, uses PhantomJS already on your path.
#Jasmine.configure do |config|
# config.prevent_phantomjs_auto_install = true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We want to enable this option (see jasmine/jasmine-gem#213). In our env phantomjs is managed by puppet. We don't want this gem downloading it from the internet on use.

@QuantumCatgirl
Copy link
Contributor Author

@alext Done.

Will Tomlins added 3 commits June 2, 2014 10:07
Also cleaned up the jasmine environment. Jasmine 2
uses poltergeist instead of selenium-webdriver and
so is jenkins-friendly. Additionally, it's now 
possible to use the asset pipeline to include source
assets instead of having to maintain a list in jasmine.yml.

Tests do not pass (and didn't before this change).
edds added a commit that referenced this pull request Jun 2, 2014
@edds edds merged commit 04ed849 into master Jun 2, 2014
@edds edds deleted the headless-js-ci branch June 2, 2014 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants