Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 4 commits
  • 4 files changed
  • 0 commit comments
  • 2 contributors
Showing with 25 additions and 11 deletions.
  1. +8 −6 Gemfile.lock
  2. +6 −1 History.md
  3. +4 −3 aruba.gemspec
  4. +7 −1 lib/aruba/api.rb
View
14 Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- aruba (0.4.5)
+ aruba (0.4.6)
bcat (>= 0.6.1)
- childprocess (>= 0.1.9)
- cucumber (>= 0.10.7)
+ childprocess (>= 0.2.0)
+ cucumber (>= 1.0.2)
rdiscount (>= 1.6.8)
rspec (>= 2.6.0)
@@ -24,10 +24,11 @@ GEM
term-ansicolor (>= 1.0.5)
diff-lcs (1.1.2)
ffi (1.0.9)
- gherkin (2.4.5)
+ gherkin (2.4.6)
json (>= 1.4.6)
json (1.5.3)
- rack (1.3.1)
+ rack (1.3.2)
+ rake (0.9.2)
rdiscount (1.6.8)
rspec (2.6.0)
rspec-core (~> 2.6.0)
@@ -37,10 +38,11 @@ GEM
rspec-expectations (2.6.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.6.0)
- term-ansicolor (1.0.5)
+ term-ansicolor (1.0.6)
PLATFORMS
ruby
DEPENDENCIES
aruba!
+ rake (>= 0.9.2)
View
7 History.md
@@ -1,6 +1,11 @@
+## [v0.4.6](https://github.com/cucumber/aruba/compare/v0.4.5...v0.4.6)
+
+* Upgraded deps to latest gems. (Aslak Hellesøy)
+* Added Regexp support to Aruba::Api#assert_no_partial_output (Aslak Hellesøy)
+
## [v0.4.5](https://github.com/cucumber/aruba/compare/v0.4.4...v0.4.5)
-* Better assertion failure message when an exit code is not as expected
+* Better assertion failure message when an exit code is not as expected. (Matt Wynne)
## [v0.4.4](https://github.com/cucumber/aruba/compare/v0.4.3...v0.4.4)
View
7 aruba.gemspec
@@ -2,18 +2,19 @@
Gem::Specification.new do |s|
s.name = 'aruba'
- s.version = '0.4.5'
+ s.version = '0.4.6'
s.authors = ["Aslak Hellesøy", "David Chelimsky", "Mike Sassak", "Matt Wynne"]
s.description = 'CLI Steps for Cucumber, hand-crafted for you in Aruba'
s.summary = "aruba-#{s.version}"
s.email = 'cukes@googlegroups.com'
s.homepage = 'http://github.com/cucumber/aruba'
- s.add_dependency 'cucumber', '>= 0.10.7'
- s.add_dependency 'childprocess', '>= 0.1.9'
+ s.add_dependency 'cucumber', '>= 1.0.2'
+ s.add_dependency 'childprocess', '>= 0.2.0'
s.add_dependency 'rspec', '>= 2.6.0'
s.add_dependency 'bcat', '>= 0.6.1'
s.add_dependency 'rdiscount', '>= 1.6.8'
+ s.add_development_dependency 'rake', '>= 0.9.2'
s.rubygems_version = ">= 1.6.1"
s.files = `git ls-files`.split("\n")
View
8 lib/aruba/api.rb
@@ -130,10 +130,12 @@ def stderr_from(cmd)
end
def all_stdout
+ stop_processes!
only_processes.inject("") { |out, ps| out << ps.stdout(@aruba_keep_ansi) }
end
def all_stderr
+ stop_processes!
only_processes.inject("") { |out, ps| out << ps.stderr(@aruba_keep_ansi) }
end
@@ -154,7 +156,11 @@ def assert_matching_output(expected, actual)
end
def assert_no_partial_output(unexpected, actual)
- actual.should_not include(unexpected)
+ if Regexp === unexpected
+ unescape(actual).should_not =~ unexpected
+ else
+ unescape(actual).should_not include(unexpected)
+ end
end
def assert_passing_with(expected)

No commit comments for this range

Something went wrong with that request. Please try again.