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

Upgrade capybara to 2 1 #67

Merged
merged 3 commits into from Jan 20, 2014

Conversation

victormartins
Copy link
Contributor

Upgrading capybara to 2.1 and running the specs, I've noticed that it only had one problem. Capybara deprecated the method wait_until, as explained here: http://www.elabs.se/blog/53-why-wait_until-was-removed-from-capybara

Evergreen only used that method in one place, and, as far as I know, it was only to prevent the evergreen tests to hang forever. So, I moved the timout helper ( that wait_until used ) to evergreen and used it in replace of wait_until.

Specs are passing, so it seems ok.

Can you review this please?

Thanks.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 76b720a on victormartins:upgrade_to_capybara_2_1 into c313606 on jnicklas:master.

@abepetrillo
Copy link
Owner

I'll remove 1.9.2 as a ruby version we test against, and hopefully get this in. Much appreciated @victormartins!

@victormartins
Copy link
Contributor Author

My pleasure :) 👍

@abepetrillo
Copy link
Owner

Might do this as a major release given the change to support 1.9.3, what do you think?

@victormartins
Copy link
Contributor Author

I think there is no need for that. The API didn't change, no functional changes either. It's just versions. Right?

s.add_runtime_dependency("launchy")
s.add_runtime_dependency("sinatra", ["~> 1.1"])
s.add_runtime_dependency("json_pure")
s.add_runtime_dependency("coffee-script")

s.add_development_dependency('rspec', ['~> 2.0'])
s.add_development_dependency('capybara-webkit', ['~>0.7'])
s.add_development_dependency('capybara-webkit')
Copy link
Owner

Choose a reason for hiding this comment

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

Not sure if this should be s.add_development_dependency('capybara-webkit', ['=>0.7']) ?

Copy link
Owner

Choose a reason for hiding this comment

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

I guess the webkit version is handled by capybara version being higher than 2.0, I guess the flexibility is better when including this in a rails app

@abepetrillo
Copy link
Owner

@jnicklas Does this warrant a bump in version to 2.0, or 1.1.0?

abepetrillo added a commit that referenced this pull request Jan 20, 2014
@abepetrillo abepetrillo merged commit 27d3f34 into abepetrillo:master Jan 20, 2014
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