summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-05-20 16:56:00 +0200
committerMarius Bakke <mbakke@fastmail.com>2020-05-20 23:51:25 +0200
commit2fc3cc244a16f641079cdfb758e37c8a3b8e2ed4 (patch)
treefd0cd7faa1ac07af125b16d06798e6c964ebd03f /gnu
parentdef7908a59bbf27f5d660ebf79fe1cc7a0153133 (diff)
gnu: ruby-mocha: Update to 1.11.2.
* gnu/packages/ruby.scm (ruby-mocha): Update to 1.11.2. [arguments]: Remove obsolete phases. Add phase to solve a dependency cycle. [native-inputs]: Remove BUNDLER, RUBY-YARD, RUBY-TEST-UNIT, and RUBY-REDCARPET. * gnu/packages/rails.scm (ruby-web-console)[arguments]: Remove workaround for old Mocha version.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/rails.scm6
-rw-r--r--gnu/packages/ruby.scm48
2 files changed, 11 insertions, 43 deletions
diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm
index f77c153197..2fc7f0a113 100644
--- a/gnu/packages/rails.scm
+++ b/gnu/packages/rails.scm
@@ -555,12 +555,6 @@ application bootup, plugins, generators, and Rake tasks.")
;; tzinfo-data is propagated by ruby-activesupport, but it
;; needs to be in the Gemfile to become available.
(("group :test do") "group :test do\n gem 'tzinfo-data'"))
- #t))
- (add-after 'unpack 'fix-mocha-minitest-require
- (lambda _
- (substitute* "test/test_helper.rb"
- ;; This chanegd in recent versions of Mocha
- (("mocha/minitest") "mocha/mini_test"))
#t)))))
(propagated-inputs
`(("ruby-actionview" ,ruby-actionview)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index b3e28261e0..5eb75d7c62 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -2990,53 +2990,27 @@ Ruby, but can be used for all programs.")
(define-public ruby-mocha
(package
(name "ruby-mocha")
- (version "1.1.0")
+ (version "1.11.2")
(source (origin
(method url-fetch)
(uri (rubygems-uri "mocha" version))
(sha256
(base32
- "107nmnngbv8lq2g7hbjpn5kplb4v2c8gs9lxrg6vs8gdbddkilzi"))))
+ "0hxmkm8qxd04vwj8mqnpyrf2dwy7g1k9zipdfhl4y71cw7ijm9n4"))))
(build-system ruby-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'add-test-unit-to-search-path
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((test-unit (assoc-ref inputs "ruby-test-unit")))
- (substitute* "Rakefile"
- (("t\\.libs << 'test'" line)
- (string-append line "; t.libs << \""
- test-unit "/lib/ruby/vendor_ruby"
- "/gems/test-unit-"
- ,(package-version ruby-test-unit)
- "/lib\""))))
- #t))
- (add-before 'check 'use-latest-redcarpet
- (lambda _
- (substitute* "mocha.gemspec"
- (("<redcarpet>.freeze, \\[\"~> 1\"\\]")
- "<redcarpet>.freeze, [\">= 3\"]"))
- #t))
- (add-before 'check 'hardcode-version
- (lambda _
- ;; Mocha is undefined at build time
- (substitute* "Rakefile"
- (("#\\{Mocha::VERSION\\}") ,version))
- #t))
- (add-before 'check 'remove-failing-test
- ;; FIXME: This test fails for reasons unrelated to Guix packaging.
- (lambda _
- (delete-file "test/acceptance/stubbing_nil_test.rb")
- #t)))))
- (propagated-inputs
- `(("ruby-metaclass" ,ruby-metaclass)))
+ (add-before 'check 'remove-rubocop-dependency
+ (lambda _
+ ;; Disable dependency on Rubocop, which is just a linter,
+ ;; and would introduce a circular dependency.
+ (substitute* "mocha.gemspec"
+ ((".*rubocop.*")
+ "true\n"))
+ #t)))))
(native-inputs
- `(("bundler" ,bundler)
- ("ruby-yard" ,ruby-yard)
- ("ruby-introspection" ,ruby-introspection)
- ("ruby-test-unit" ,ruby-test-unit)
- ("ruby-redcarpet" ,ruby-redcarpet)))
+ `(("ruby-introspection" ,ruby-introspection)))
(synopsis "Mocking and stubbing library for Ruby")
(description
"Mocha is a mocking and stubbing library with JMock/SchMock syntax, which