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

triangle tests now conforming to canonical #95

Merged
merged 4 commits into from
Oct 11, 2019
Merged

triangle tests now conforming to canonical #95

merged 4 commits into from
Oct 11, 2019

Conversation

neenjaw
Copy link
Collaborator

@neenjaw neenjaw commented Oct 10, 2019

  • version bumped to 1.2.1
  • trailing whitespace removed from README.md
  • triangle.example and triangle_tests.plt:
    • There was some inconsistencies with the triangle predicate which @Average-user pointed out in non-exhaustive tests #81,
    • the tests were treating it like triangle(+Side1, +Side2, +Side3, +Type) but it was written in triangle.example to only be correct if used triangle(+Side1, +Side2, +Side3, -Type)
    • triangle.example has been changed now to pass the tests.

@Average-user Average-user self-requested a review October 11, 2019 00:20
@Average-user
Copy link
Member

@neenjaw Ok to merge?

@neenjaw
Copy link
Collaborator Author

neenjaw commented Oct 11, 2019

I'm good if you're happy with it,

I thought I fixed the trailing newline on the version file, but it seems to be missing.

@Average-user
Copy link
Member

Thats because there were conflicts with master. I think I fixed them but I never understood that tool weell enough. Will see after merge

@Average-user
Copy link
Member

But do you want it with or without a newline at end?

@neenjaw
Copy link
Collaborator Author

neenjaw commented Oct 11, 2019

I like it on, because then there isn't that symbol on the diff, but I can't push a commit for 30 minutes or so until I can get to a computer

@neenjaw
Copy link
Collaborator Author

neenjaw commented Oct 11, 2019

Ready!

@Average-user Average-user merged commit 2859d12 into exercism:master Oct 11, 2019
@neenjaw neenjaw deleted the triangle-tests branch October 11, 2019 01:52
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.

2 participants