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

Change some tests to use buttercup #1659

Merged
merged 1 commit into from
Apr 13, 2016
Merged

Change some tests to use buttercup #1659

merged 1 commit into from
Apr 13, 2016

Conversation

ckoparkar
Copy link
Contributor

Before submitting a PR make sure the following things have been done (and denote this
by checking the relevant checkboxes):

  • The commits are consistent with our contribution guidelines
  • You've added tests (if possible) to cover your change(s)
  • All tests are passing (make test)
  • The new code is not generating bytecode or M-x checkdoc warnings
  • You've updated the changelog (if adding/changing user-visible functionality)
  • You've updated the readme (if adding/changing user-visible functionality)
  • You've updated the refcard (if you made changes to the commands listed there)

Thanks!

@ckoparkar
Copy link
Contributor Author

Start fixing #1650
A bulk of the tests are still not migrated. I'll submit separate PR for some of the larger files.

@ckoparkar ckoparkar changed the title Feature/buttercup Change some tests to use buttercup Apr 11, 2016
(should-error (cider-apropos "test") :type 'user-error)))
(describe "cider-apropos"
(it "raises user-error when cider is not connected."
(expect (lambda () (cider-apropos "test")) :to-throw 'user-error))
Copy link
Member

Choose a reason for hiding this comment

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

Is this lambda really necessary? Doesn't it work if you just write the code to be executed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I believe it is necessary for the to-throw matcher. Otherwise the error is not handled and the tests fail with error: (user-error "nil needs an active nREPL connection").

@bbatsov
Copy link
Member

bbatsov commented Apr 12, 2016

You'll have to update the travis config to run the buttercup tests and the ert tests. Otherwise we can't make a staged migration to buttercup.

@ckoparkar
Copy link
Contributor Author

Done. Have squashed everything into a single commit and rebased against the latest master. Also, should we mention the migration somewhere in the contributing guide, or somewhere else ? So that newer PR's would use buttercup instead of ert.

@ckoparkar
Copy link
Contributor Author

I've changed some more files, but din't include them here because this PR has gotten big enough. Will submit follow up PR's.

@bbatsov bbatsov merged commit 8827eb1 into clojure-emacs:master Apr 13, 2016
@bbatsov
Copy link
Member

bbatsov commented Apr 13, 2016

Also, should we mention the migration somewhere in the contributing guide, or somewhere else ?

After the migration is ready we can add something about this in the docs. Hopefully the migration won't take long - we don't have many tests.

@ckoparkar ckoparkar deleted the feature/buttercup branch April 13, 2016 07:10
@Malabarba
Copy link
Member

Cool. Thanks for the effort and patience. :-)

@ckoparkar
Copy link
Contributor Author

Thanks @Malabarba 🎉

Malabarba added a commit that referenced this pull request Apr 21, 2016
[Fix #1659] Add fringe indicators for evaluated forms
ajchemist pushed a commit to ajchemist/cider that referenced this pull request Apr 25, 2016
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.

4 participants