mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
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.
This commit is contained in:
parent
def7908a59
commit
2fc3cc244a
2 changed files with 11 additions and 43 deletions
|
@ -555,12 +555,6 @@ (define-public ruby-web-console
|
|||
;; 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)
|
||||
|
|
|
@ -2990,53 +2990,27 @@ (define-public ruby-rerun
|
|||
(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
|
||||
(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"
|
||||
(("<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")
|
||||
((".*rubocop.*")
|
||||
"true\n"))
|
||||
#t)))))
|
||||
(propagated-inputs
|
||||
`(("ruby-metaclass" ,ruby-metaclass)))
|
||||
(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
|
||||
|
|
Loading…
Reference in a new issue