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

Updates for RSpec 3 #3265

Merged
merged 1 commit into from Aug 21, 2015
Merged

Updates for RSpec 3 #3265

merged 1 commit into from Aug 21, 2015

Conversation

benlovell
Copy link
Contributor

Updates JI integration specs to RSpec 3 syntax. This was performed mostly via transpec but did require a modicum of manual fixups. Some of the key gotchas were around the semantics of pending and skip - especially the block form of pending which has since been deprecated. The raise_error matcher now requires an explicit error to reduce false-positives.

I made a few other minor cleanups and there were some flat-out broken specs that were fixed too.

There is still plenty of room for improvement in the tests that I'll be happy to soldier on with.

The history isn't the cleanest so I'll squash this down to something sane once it's green but it should be good to go otherwise. ❤️

@kares
Copy link
Member

kares commented Aug 19, 2015

great, was hoping to have it on jruby-1_7 but I guess it won't work in --1.8 ;( mode ... thus 9K it is!

@kares
Copy link
Member

kares commented Aug 19, 2015

changing be_false, be_true, be_nil to be true ... should handle most of the spec:ji failures

@benlovell benlovell force-pushed the rspec-3 branch 2 times, most recently from 6f54606 to a79a887 Compare August 19, 2015 18:45
@benlovell benlovell changed the title WIP: Updates for RSpec 3 Updates for RSpec 3 Aug 19, 2015
@benlovell
Copy link
Contributor Author

Of course now having upgraded to RSpec 3 there are other failures. I'll get those sorted now - they seem to be mostly around the pending change. 🙈

@benlovell benlovell force-pushed the rspec-3 branch 2 times, most recently from 1bf0d71 to 46b8340 Compare August 21, 2015 06:22
@benlovell
Copy link
Contributor Author

It seems those outstanding CI issues are unrelated to my changes, so I think this is good to go otherwise. I'll squish it down to something sensible when I get the OK.

@benlovell
Copy link
Contributor Author

@kares thanks for reviewing 😍 Those issues should be addressed now.

@kares
Copy link
Member

kares commented Aug 21, 2015

💜 😌 looks 🚀 🚢 OK to me ... do you want to merge as is or squish it ⬇️ ?

p.s. also there's a 💚 base if you're rebasing (but I do not think @enebo will mind)

Mostly simple syntax changes to the new `expect` style but also various
manual fixes where transpec didn't quite do the job. Normally around
the new `pending` semantics, and that the block form of `pending` is
deprecated.

Another big one was being explicit about the types of errors thrown.

There is still plenty of room for improvement here but at least we are
up and running on the latest/greatest RSpec vintage.
@benlovell
Copy link
Contributor Author

@kares I rebased and squashed into one logical commit. 🚢 :shipit: 😍

enebo added a commit that referenced this pull request Aug 21, 2015
@enebo enebo merged commit 18e47a7 into jruby:master Aug 21, 2015
@enebo
Copy link
Member

enebo commented Aug 21, 2015

the spec ci run finished green so no need to wait for osgi++ to finish....thanks @benlovell this is massive!

@enebo enebo added this to the JRuby 9.0.1.0 milestone Aug 21, 2015
@benlovell benlovell deleted the rspec-3 branch August 21, 2015 14:54
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

3 participants