public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Hans de Graaff" <graaff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/best_in_place/
Date: Wed, 10 May 2017 06:11:49 +0000 (UTC)	[thread overview]
Message-ID: <1494396690.a714865b6fe8423bada60e0c82247cf58f47367f.graaff@gentoo> (raw)

commit:     a714865b6fe8423bada60e0c82247cf58f47367f
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 06:11:30 2017 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Wed May 10 06:11:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a714865b

dev-ruby/best_in_place: add ruby22, drop integration tests

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-ruby/best_in_place/best_in_place-3.1.0.ebuild | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev-ruby/best_in_place/best_in_place-3.1.0.ebuild b/dev-ruby/best_in_place/best_in_place-3.1.0.ebuild
index 9bb8d317920..40a701276a5 100644
--- a/dev-ruby/best_in_place/best_in_place-3.1.0.ebuild
+++ b/dev-ruby/best_in_place/best_in_place-3.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -35,10 +35,8 @@ ruby_add_bdepend "
 		dev-ruby/rspec-rails:3
 		>=dev-ruby/nokogiri-1.5.0
 		>=dev-ruby/capybara-1.1.2:0
-		dev-ruby/poltergeist
 		>=dev-ruby/rails-3.2
 		>=dev-ruby/sqlite3-1.3.4-r1
-		dev-ruby/launchy
 		dev-ruby/bundler
 	)"
 
@@ -53,7 +51,13 @@ all_ruby_prepare() {
 		-e '2agem "rspec", "~>3.0"' \
 		-e '2agem "jquery-rails"' -e '2agem "jquery-ui-rails"' \
 		-e '/byebug/ s:^:#:' \
+		-e '/\(launchy\|poltergeist\)/d' \
 		Gemfile
+	sed -i -e '/poltergeist/,/javascript_driver/ s:^:#:' spec/rails_helper.rb || die
+
+	# Remove integration tests. They fail to run and depend on obsolete
+	# poltergeist/phantomjs.
+	rm -rf spec/integration || die
 }
 
 each_ruby_test() {


             reply	other threads:[~2017-05-10  6:11 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-10  6:11 Hans de Graaff [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-07-19  6:14 [gentoo-commits] repo/gentoo:master commit in: dev-ruby/best_in_place/ Hans de Graaff
2020-08-23  6:24 Hans de Graaff
2019-05-06 17:58 Hans de Graaff
2018-12-13  8:09 Hans de Graaff
2018-05-05  9:36 Hans de Graaff
2017-09-23  7:51 Hans de Graaff
2017-06-06  4:57 Hans de Graaff
2016-08-01  5:41 Hans de Graaff
2016-05-09 22:24 Manuel Rüger
2015-12-09  6:30 Hans de Graaff

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1494396690.a714865b6fe8423bada60e0c82247cf58f47367f.graaff@gentoo \
    --to=graaff@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox