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

Use Sinatra::Runner In Integration Test #840

Closed
wants to merge 2 commits into from

Conversation

apotonick
Copy link
Contributor

As per PR sinatra/sinatra-contrib#122 we now use Sinatra::Runner for integration tests.

Only problem is that we have a development dependency to sinatra-contrib but @rkh promised to look into that.

@rkh
Copy link
Member

rkh commented Feb 12, 2014

Hey, I just met you, and this is crazy, but there's a conflict, so rebase, maybe?

@apotonick
Copy link
Contributor Author

You have to merge the sinatra-contrib PR first, then point the sinatra Gemfile to the updated gem. 💋

@JonRowe
Copy link
Contributor

JonRowe commented Feb 13, 2014

Hey, I just met you, and this is crazy, but there's a conflict, so rebase, maybe?

New favourite git comment

@zzak zzak added this to the 1.5.0 milestone Feb 6, 2015
@zzak zzak added the feature label Feb 6, 2015
@zzak zzak modified the milestones: 2.0.0, 1.5.0 Jan 31, 2016
@zzak
Copy link
Member

zzak commented Jan 31, 2016

We can merge this once it is rebased, and sinatra-contrib is updated to support Sinatra master branch

@zzak
Copy link
Member

zzak commented Aug 17, 2016

Rebased and fixed in 80016d7

@zzak zzak closed this Aug 17, 2016
@apotonick
Copy link
Contributor Author

💋

@zzak
Copy link
Member

zzak commented Aug 17, 2016

@apotonick <3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants