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

Add support for 3.0.0 #47

Merged
merged 4 commits into from
Aug 12, 2014
Merged

Add support for 3.0.0 #47

merged 4 commits into from
Aug 12, 2014

Conversation

yelled3
Copy link
Contributor

@yelled3 yelled3 commented Mar 26, 2014

Issue: #46

@yelled3 yelled3 changed the title change to "rspec", ">= 3.0.0.beta2" Add support for 3.0.0.beta2 [WIP] Mar 26, 2014
@yelled3 yelled3 changed the title Add support for 3.0.0.beta2 [WIP] Add support for 3.0.0.beta2 Mar 26, 2014
@yelled3
Copy link
Contributor Author

yelled3 commented Mar 26, 2014

@philostler take a look :-)

context "when expected is a delay" do
it "returns message" do
expect(delay_subject.negative_failure_message).to eq "expected Object.nil? to not be delayed"
expect(delay_subject.failure_message_when_negated).to eq "expected Object.nil? to not be delayed"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@philostler IMO, you should invoke failure_message_when_negated directly

I think it's much better to do:
https://github.com/rspec/rspec-expectations/blob/master/spec/rspec/matchers/built_in/compound_spec.rb#L48

@zolzaya
Copy link

zolzaya commented May 5, 2014

+1

@yelled3
Copy link
Contributor Author

yelled3 commented May 5, 2014

@zolzaya @philostler good to merge?

@philostler philostler added this to the 1.1.0 milestone May 7, 2014
@philostler
Copy link
Collaborator

Mmm.... This isn't backwards compatible with RSpec 2.x and without 3 out yet I'm not willing to merge is in with master.

RSpec 3 support is of course required though, I'll sort out a new branch to maintain RSpec 3 support shortly

@zolzaya
Copy link

zolzaya commented May 8, 2014

@philostler, @yelled3 thank you guys :D

@aprescott
Copy link
Contributor

RSpec 3 is now out. Anything new with this? I'm upgrading a project to RSpec 3 and it would be good to remove deprecation warnings from this gem.

Sidekiq::Batch.stub(:new) { RSpec::Sidekiq::NullBatch.new }
Sidekiq::Batch::Status.stub(:new) { RSpec::Sidekiq::NullStatus.new }
allow(Sidekiq::Batch).to receive(:new) { RSpec::Sidekiq::NullBatch.new }
allow(Sidekiq::Batch::Status).to receive(:new) { RSpec::Sidekiq::NullStatus.new }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@yelled3
Copy link
Contributor Author

yelled3 commented Jun 3, 2014

@aprescott i'll need to recheck :-)

@yelled3 yelled3 changed the title Add support for 3.0.0.beta2 Add support for 3.0.0 Jun 5, 2014
Adam Farhi added 2 commits June 5, 2014 15:11
…ec3-beta

Conflicts:
	lib/rspec/sidekiq/matchers/have_enqueued_job.rb
	rspec-sidekiq.gemspec
@yelled3
Copy link
Contributor Author

yelled3 commented Jun 5, 2014

@dmasur I removed you're alias_method, and just rename the method.
please take a look.

ref:
3c9b036
7ef8e81

@aprescott other then that - I think we're good to go.

@dmasur
Copy link
Contributor

dmasur commented Jun 5, 2014

looks great. thanks

@aprescott
Copy link
Contributor

It looks like you're still using rbx on Travis, by the way. If you change it to rbx-2, you should get passing builds again for Rubinius.

@tombh
Copy link

tombh commented Jun 8, 2014

Just to say putting gem 'rspec-sidekiq', github: 'yelled3/rspec-sidekiq', branch: 'rspec3-beta' made my specs much quieter. Looking forward to the merge :)

@yelled3
Copy link
Contributor Author

yelled3 commented Jun 8, 2014

@aprescott CI is green again - thanks for the tip :-)

Looking forward to the merge

@zolzaya @philostler @dmasur good to merge?

@dmasur
Copy link
Contributor

dmasur commented Jun 8, 2014

Seal Go for it

@yelled3
Copy link
Contributor Author

yelled3 commented Jun 8, 2014

@dmasur I don't have merge permissions :-/

@philostler
Copy link
Collaborator

OK, thanks for your work on this everyone. I've been distracted with other projects over the last few months but I'm finally moving back to sorting out the pull request/issues etc on rspec-sidekiq.

I'm actually migrating some of my projects over to RSpec 3 atm so I'm going to be grabbing this and start playing with it shortly before merging.

There are a a few feature pull requests that have come in and I need to get a steer on whether those guys need RSpec 2 support with those features or not. I'm also weary about dropping RSpec 2 support completely as there are still a lot of people on 2.x that won't be upgrading right away

@yelled3
Copy link
Contributor Author

yelled3 commented Jun 8, 2014

@philostler FYI, make sure to checkout transpec
http://yujinakayama.me/transpec/

@philostler
Copy link
Collaborator

@yelled3 Nice, cheers for that. That'll save some 🕦

@philostler philostler added this to the 2.0.0 milestone Jun 8, 2014
@philostler philostler removed this from the 1.1.0 milestone Jun 8, 2014
@philostler
Copy link
Collaborator

I'm pegging this pull request to the 2.0.0 milestone as this is a breaking change for RSpec 2 users. Also means I can feed in features for the RSpec 2 guys before the upgrade

@aprescott
Copy link
Contributor

Is there an estimated time this'll be available in a release?

@yelled3
Copy link
Contributor Author

yelled3 commented Jun 20, 2014

Is there an estimated time this'll be available in a release?

👍

@philostler
Copy link
Collaborator

This is now merged into the 2-0-0 branch. Master is reserved for issues with the 1.1.0 release atm.

I'm seeing 4 tests failing which is probably to do with the pull requests for the 1.1.0 release clashing with this pull. There's also some implementation upgrading, linting and spec improvements I'm going to make before pushing out a full release.

I'll however prioritise getting the tests passing and hang out a 2.0.0.beta release so it's out in the wild getting tested.

@yelled3
Copy link
Contributor Author

yelled3 commented Jun 25, 2014

I'm seeing 4 tests failing

@philostler i'll take a look

@aprescott
Copy link
Contributor

Can confirm one case of a project working off the 2-0-0 branch (specifically 926a1da)! No errors.

@davetoxa
Copy link

davetoxa commented Aug 5, 2014

What is a due date of release this?

@philostler philostler merged commit e4d2e34 into wspurgin:master Aug 12, 2014
@philostler
Copy link
Collaborator

Now merged into master. Some cleanup work to be done (lot of pull requests merged lately) but should be good for a alpha/beta release very soon

philostler pushed a commit that referenced this pull request Aug 12, 2014
@aprescott
Copy link
Contributor

Thanks for merging!

@yelled3
Copy link
Contributor Author

yelled3 commented Aug 12, 2014

long last - cheers :-)

@philostler
Copy link
Collaborator

This is now released as a 2.0.0.beta gem build for people to test out

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

Successfully merging this pull request may close these issues.

None yet

7 participants