baf 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a22622dd602a592828ff11f450a861883355d1
-  data.tar.gz: 83d308e32b89f49d4298122231fbd457ae3f0c70
+  metadata.gz: c706eccaeb576703318da1f4b064a6ad6022b120
+  data.tar.gz: 8317a9cc42d852c2dcce64e3e31d10fecb33846b
 SHA512:
-  metadata.gz: e286d14950f9dffd81ea0d642489b15ad140cbd10d6ca00f278dfb313a0bd4f8f2150a1118ab64b5aba7b4e43f57b861c3e0b30f80d160b8dee1454a9eb76f7f
-  data.tar.gz: bb3d0466a293136ffac2f1453718b4fb7e82fa1e4b06a5ddc543faeafde189d780067406cdc7b2ab537b6b86dca8cf0fe2a5d969fa0f6b9b6d92bb1857bdbaef
+  metadata.gz: cd2ecfe25f573437c0d4d2611ddf9653418eb6bda3cb703d1901b4dedd1d5193bac918fa3fcd6d144145b25369af7ce64cf32f40a5f55a379cfb1cea1b27f156
+  data.tar.gz: c327237b3b0bd01196b080713c710efe8eea223a35b104d201d736dddfd8340ad4407c67a016b7021232f8f119c2bc5cccd3d86d5ffed14930d5673975afdd2d

data/lib/baf/cli.rb

@@ -15,7 +15,7 @@ module Baf
 
     class << self
       def run arguments, stdout: $stdout, stderr: $stderr
-        cli = new env_class.new(stdout), arguments
+        cli = new env_class.new(output: stdout), arguments
         cli.parse_arguments!
         cli.run
       rescue ArgumentError => e

data/lib/baf/env.rb

@@ -5,7 +5,7 @@ module Baf
     extend Forwardable
     def_delegators :@output, :print, :puts
 
-    def initialize output
+    def initialize output: $stdout
       @output = output
     end
   end

data/lib/baf/testing/cucumber/steps/input.rb

@@ -0,0 +1,3 @@
+When /^I input "([^"]+)"$/ do |content|
+  last_command_started.write unescape_text content
+end

data/lib/baf/testing/cucumber/steps/output.rb

@@ -8,8 +8,9 @@ def build_regexp pattern, options
   end)
 end
 
-def expect_output content
-  expect(last_command_started.output).to eq unescape_text content
+def expect_output content, stream: :output
+  stream = :stderr if stream == :error
+  expect(last_command_started.send stream).to eq unescape_text content
 end
 
 
@@ -17,12 +18,17 @@ Then /^the output must contain "([^"]+)"$/ do |content|
   expect(last_command_started.output).to include unescape_text content
 end
 
+Then /^the output must not contain "([^"]+)"$/ do |content|
+  expect(last_command_started.output).not_to include unescape_text content
+end
+
 Then /^the output must contain exactly:$/ do |content|
   expect_output content + $/
 end
 
-Then /^the output must contain exactly "([^"]+)"$/ do |content|
-  expect_output content
+Then /^the( error)? output must contain exactly "([^"]+)"$/ do |stream, content|
+  stream = stream ? :error : :output
+  expect_output content, stream: stream
 end
 
 Then /^the output must match \/([^\/]+)\/([a-z]*)$/ do |pattern, options|

data/lib/baf/testing/cucumber/steps/output_wait.rb

@@ -13,14 +13,15 @@ module Baf
   end
 end
 
-def wait_output! pattern
+def wait_output! pattern, times: 1, results: nil
   output = -> { last_command_started.output }
   wait_until do
     case pattern
-    when Regexp then output.call =~ pattern
+    when Regexp then (results = output.call.scan(pattern)).size >= times
     when String then output.call.include? pattern
     end
   end
+  results
 rescue Baf::Testing::WaitError => e
   fail <<-eoh
 expected `#{pattern}' not seen after #{e.timeout} seconds in:
@@ -29,7 +30,9 @@ expected `#{pattern}' not seen after #{e.timeout} seconds in:
 end
 
 def wait_until message: 'condition not met after %d seconds'
-  timeout = 2
+  timeout = ENV.key?('BAF_TEST_TIMEOUT') ?
+    ENV['BAF_TEST_TIMEOUT'].to_i :
+    2
   Timeout.timeout(timeout) do
     loop do
       break if yield
@@ -45,6 +48,10 @@ Then /^the output will match \/([^\/]+)\/([a-z]*)$/ do |pattern, options|
   wait_output! build_regexp(pattern, options)
 end
 
+Then /^the output will contain:$/ do |content|
+  wait_output! content + $/
+end
+
 Then /^the output will contain "([^"]+)"$/ do |content|
   wait_output! content
 end

data/lib/baf/version.rb

@@ -1,3 +1,3 @@
 module Baf
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baf
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: baf-testing
@@ -52,6 +52,7 @@ files:
 - lib/baf/options_registrant.rb
 - lib/baf/testing/cucumber.rb
 - lib/baf/testing/cucumber/steps/execution.rb
+- lib/baf/testing/cucumber/steps/input.rb
 - lib/baf/testing/cucumber/steps/output.rb
 - lib/baf/testing/cucumber/steps/output_wait.rb
 - lib/baf/version.rb