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.

Sign up for GitHub

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

Resolve issue 961 #983

Merged
merged 2 commits into from
Jul 7, 2016
Merged

Resolve issue 961 #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b081ce6
Update History.md after merging 960
May 26, 2016
87cf23b
Update Gemfile to get wire protocol from git
May 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@ gemspec
unless ENV['CUCUMBER_USE_RELEASED_CORE']
core_path = File.expand_path("../../cucumber-ruby-core", __FILE__)
wire_path = File.expand_path("../../cucumber-ruby-wire", __FILE__)
if File.exist?(core_path) && !ENV['CUCUMBER_USE_GIT_CORE']
gem 'cucumber-core', :path => core_path
gem 'cucumber-wire', :path => wire_path
if File.exist?(core_path) && !ENV["cucumber_use_git_core"]
gem "cucumber-core", :path => core_path
else
gem 'cucumber-core', :git => "https://github.com/cucumber/cucumber-ruby-core.git"
gem "cucumber-core", :git => "git://github.com/cucumber/cucumber-ruby-core.git"
Copy link

@ghost ghost Jul 8, 2016 •
edited by ghost
Loading

Choose a reason for hiding this comment

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

@danascheider Please don't use git:// this cannot be forwarded via HTTP proxies. Better use https:// instead. Otherwise contributors behind HTTP-proxies need to rewrite the Gemfile each time they want to submit a PR and don't have local clones.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh jeez, can't believe I didn't notice that. Thanks for pointing that out - will change.

Copy link

Choose a reason for hiding this comment

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

Thanks a lot. :-)

end

if File.exist?(wire_path) && !ENV["CUCUMBER_USE_GIT_CORE"]
gem "cucumber-wire", :path => wire_path
else
gem "cucumber-wire", :git => "git://github.com/cucumber/cucumber-ruby-wire.git"
end
end

Expand Down
1 change: 1 addition & 0 deletions History.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

### Bugfixes

* Use HTTPS instead of Git as transport protocol ([#960](https://github.com/cucumber/cucumber-ruby/pull/960))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This commit is haunting me, it wants to be in all my PRs for some reason!!

Copy link
Contributor

Choose a reason for hiding this comment

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

Of course, it is not on cucumber:master but it is on the PR branch. This time (but not in the case of #982), its parent commit is the tip of cucumber:master so I pushed it to cucumber:master, it should disappear from this PR now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you!

* Make random order stable and platform independent ([#974](https://github.com/cucumber/cucumber-ruby/pull/974), closes [#971](https://github.com/cucumber/cucumber-ruby/issues/971))
* Run scenarios in fully random order ([#970](https://github.com/cucumber/cucumber-ruby/pull/970) @threedaymonk)
* Adding Test Step in AfterStep hook. ([#931](https://github.com/cucumber/cucumber-ruby/pull/931) @t-morgan)
Expand Down