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

Remove conditionals that will remain fixed once 1.0.0 is released #483

Merged
merged 4 commits into from
Sep 14, 2017
Merged

Remove conditionals that will remain fixed once 1.0.0 is released #483

merged 4 commits into from
Sep 14, 2017

Conversation

mvz
Copy link
Contributor

@mvz mvz commented Sep 2, 2017

Summary

Aruba contains many conditionals on Aruba::VERSION. With the pending release of 1.0.0, many of these will forever be true (or false, as the case may be). This PR removes these conditionals and any old code that will remain unused.

Motivation and Context

Part of cleaning up stuff for the 1.0.0 release.

Types of changes

  • Refactoring (cleanup of codebase withouth changing any existing functionality)

@mvz mvz changed the title Remove conditionals that will remain fixed once 1.0.0 is released [WIP] Remove conditionals that will remain fixed once 1.0.0 is released Sep 2, 2017
@mvz mvz changed the title [WIP] Remove conditionals that will remain fixed once 1.0.0 is released Remove conditionals that will remain fixed once 1.0.0 is released Sep 3, 2017
@mvz mvz requested a review from maxmeyer September 3, 2017 17:22
@mvz
Copy link
Contributor Author

mvz commented Sep 4, 2017

I'll rebase this once #487 has been merged.

Copy link
Member

@maxmeyer maxmeyer left a comment

Choose a reason for hiding this comment

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

Would you mind to use "feature" branches in the "aruba" repo? This might make collaborating easier. I was not aware of https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/. Would you mind, if I push to your branches as well?

@@ -71,13 +71,7 @@
end

Before '@requires-aruba-version-1' do |scenario|
Copy link
Member

Choose a reason for hiding this comment

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

Let's remove this all together here.

Copy link
Member

Choose a reason for hiding this comment

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

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'll fix these.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.

@mvz
Copy link
Contributor Author

mvz commented Sep 7, 2017

@maxmeyer yes, pushing to my branches is fine. I'll update my remotes anyway so I push to the cucumber/aruba repository by default.

I'm not a big fan of using / inside branch names because it interferes with command line completion and automatic local tracking branch creation.

@mvz
Copy link
Contributor Author

mvz commented Sep 7, 2017

I rebased but canceled the build for now due to #492.

@mvz
Copy link
Contributor Author

mvz commented Sep 13, 2017

@maxmeyer I made your requested changes and rebased again. Can you take another look?

Copy link
Member

@maxmeyer maxmeyer left a comment

Choose a reason for hiding this comment

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

Good to go.

@maxmeyer maxmeyer merged commit 287376a into cucumber:master Sep 14, 2017
@mvz mvz deleted the remove-version-1-0-conditions branch September 14, 2017 06: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