superbara 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3909dad114b84f3a1f3ff199b87b279ab4ffdd37123d1d9cfaef699cf14fcafb
-  data.tar.gz: 31755ae0ce8e2b79ac5b53edf42d580610fdf402611d7b20179cad39bb815d96
+  metadata.gz: 2238d76a17abb6017288ec127e19d7e38da5a3a450aab924ccab843358408b82
+  data.tar.gz: d197b4816a25d7af7d3846bfd46410091e6aa6dceb3d513991868ea995f51f8f
 SHA512:
-  metadata.gz: cf7aa8ff7792e5b427fc55e7cce7a9847e6c112b65fe8eff1f1975efa9cbf4733d4b031d1bfa79ffb604c6512529015e5f9836e42f81f47db5e49c78c38a6614
-  data.tar.gz: 6bdea68e00631dbf1f21f2548256770ca3ce165442f46ba48e30046017f9cf4051feb7da726dcd203741847f942213e614baa2ccbc5a2204e723e56c73271f02
+  metadata.gz: b9519813335ccff5a615278d1cc00c838af1855d32fa78df72c741b13c8d3893a8eb8e940daa8d4a67a4fb3a32d41b807fa71d09735c147e25efdd9d513a71fd
+  data.tar.gz: bfc6174d941af1012e1361a24bf3531cc3ef841d0ad6d3aaf582df0ec19f15fc0eb06afaf86c6639e9bf8642324d84109fa3aa3ab8941f305ae0867e74a0cb42

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superbara (0.11.1)
+    superbara (0.12.0)
       binding_of_caller (~> 0.8, >= 0.8.0)
       capybara (~> 3.1, >= 3.1.0)
       colorize (~> 0.8, >= 0.8.1)

data/bin/tests

@@ -44,4 +44,17 @@ if [ "$exit_status" != 1 ]; then
   exit 1
 fi
 
+SUPERBARA_TAGS=example exe/superbara run tests/tags
+
+set +e
+  SUPERBARA_TAGS=fails exe/superbara run tests/tags
+  exit_status=$?
+set -e
+
+if [ "$exit_status" != 1 ]; then
+  echo "err! tests/tags when fails"
+  exit 1
+fi
+
+
 echo "success!"

data/lib/superbara.rb

@@ -231,6 +231,7 @@ require_relative "superbara/cli"
 require_relative "superbara/context"
 require_relative "superbara/web"
 require_relative "superbara/errors/not_desired_tag_error"
+require_relative "superbara/errors/export_stops_error"
 
 trap "SIGINT" do
   puts "

data/lib/superbara/context.rb

@@ -23,14 +23,31 @@ sleep 0.0001
       Superbara.main.instance_eval "@#{k} = #{eval}"
     end
 
+    not_desired_tag_error_occurred = false
+    export_stops_error = nil
     begin
       load path, true
-    rescue Superbara::Errors::NotDesiredTagError
-      Superbara.output "  ..skipped due to tag not found"
+    rescue Superbara::Errors::ExportStopsError => ex
+      export_stops_error = ex
+    rescue Superbara::Errors::NotDesiredTagError => ex
+      not_desired_tag_error_occurred = true
+      test_tags = Marshal.load(ex.message).join(",")
+      allowed_tags = Superbara.config.tags.join(",")
+      Superbara.output "  ..skipped due to test tags (#{test_tags}) not found in current tags: #{allowed_tags}"
+    ensure
+      params.each_pair do |k,v|
+        Superbara.main.instance_eval "remove_instance_variable '@#{k}'"
+      end
     end
 
-    params.each_pair do |k,v|
-      Superbara.main.instance_eval "remove_instance_variable '@#{k}'"
+    if export_stops_error
+      # sending it forward for run to return what's inside
+      raise export_stops_error
+    end
+
+    if not_desired_tag_error_occurred
+      # FAKENEWS: sending it forward for run to return false
+      raise Superbara::Errors::NotDesiredTagError
     end
   end
 

data/lib/superbara/dsl.rb

@@ -86,6 +86,10 @@ return Array.from(
     e.click
   end
 
+  def export(e)
+    raise Superbara::Errors::ExportStopsError, Marshal.dump(e)
+  end
+
   @@once_runs = []
   def run(what, once: false, **params, &block)
     if once
@@ -117,9 +121,12 @@ return Array.from(
       Superbara.project_path = File.dirname(better_what)
     end
 
-    error_happened = false
+    export_object = nil
     begin
       Superbara.current_context.__superbara_load(better_what, params)
+    rescue Superbara::Errors::NotDesiredTagError
+    rescue Superbara::Errors::ExportStopsError => ex
+      export_object = Marshal.load ex.message
     rescue Exception => ex
       if ENV["SUPERBARA_ON_ERROR"] == "continue"
         colored_output = "  ERROR: ".colorize(:red)
@@ -135,11 +142,7 @@ return Array.from(
 
     Superbara.project_path = old_project_path
 
-    if error_happened
-      false
-    else
-      true
-    end
+    export_object
   end
 
   def visit(visit_uri_or_domain_or_path)
@@ -234,7 +237,7 @@ return Array.from(
         return value
       end
     else
-      raise Superbara::Errors::NotDesiredTagError
+      raise Superbara::Errors::NotDesiredTagError, Marshal.dump(tags)
     end
   end
 

data/lib/superbara/errors/export_stops_error.rb

@@ -0,0 +1,6 @@
+module Superbara
+  module Errors
+    class ExportStopsError < StandardError
+    end
+  end
+end

data/lib/superbara/version.rb

@@ -1,3 +1,3 @@
 module Superbara
-  VERSION = "0.11.1"
+  VERSION = "0.12.0"
 end

data/tests/envs/on_error/main.rb

@@ -2,14 +2,14 @@ first = run "first_failing"
 second = run "second_ok"
 third = run "third_failing"
 
-assert do
-  first == false
+assert "first" do
+  first == nil
 end
 
-assert do
-  second == true
+assert "second" do
+  second == "second"
 end
 
-assert do
-  third == false
+assert "third" do
+  third == nil
 end

data/tests/envs/on_error/second_ok.rb

@@ -0,0 +1 @@
+export "second"

data/{examples → tests}/tags/block.rb

@@ -1,3 +1,5 @@
 tag "example", "block" do
   visit "example.com"
 end
+
+export "block"

data/tests/tags/fails.rb

@@ -0,0 +1,8 @@
+tag "fails"
+
+unless ENV["SUPERBARA_TAGS"]
+  puts "SUPERBARA_TAGS not defined, returning before fail."
+  return
+end
+
+asdf

data/tests/tags/main.rb

@@ -0,0 +1,16 @@
+simple = run "simple"
+block = run "block"
+notags = run "notags"
+fails = run "fails"
+
+assert "simple" do
+  simple == "simple"
+end
+
+assert "block" do
+  block == "block"
+end
+
+assert "notags" do
+  notags == "notags"
+end

data/tests/tags/notags.rb

@@ -0,0 +1,3 @@
+visit "example.com"
+
+export "notags"

data/{examples → tests}/tags/simple.rb

@@ -1,3 +1,6 @@
 tag "example", "simple"
 
 visit "example.com"
+
+export "simple"
+asdf # must not reach here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbara
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Matti Paksula
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -318,9 +318,6 @@ files:
 - examples/login-and-logout/using-params/main.rb
 - examples/sites/pharos.sh/main.rb
 - examples/sites/vr.fi/helsinki-tampere/main.rb
-- examples/tags/block.rb
-- examples/tags/main.rb
-- examples/tags/simple.rb
 - exe/superbara
 - lib/capybara_monkey.rb
 - lib/pry_monkey.rb
@@ -331,6 +328,7 @@ files:
 - lib/superbara/config.rb
 - lib/superbara/context.rb
 - lib/superbara/dsl.rb
+- lib/superbara/errors/export_stops_error.rb
 - lib/superbara/errors/not_desired_tag_error.rb
 - lib/superbara/helpers.rb
 - lib/superbara/rspec.rb
@@ -357,6 +355,11 @@ files:
 - tests/run/has_instance_variables.rb
 - tests/run/has_no_instance_variables.rb
 - tests/run/main.rb
+- tests/tags/block.rb
+- tests/tags/fails.rb
+- tests/tags/main.rb
+- tests/tags/notags.rb
+- tests/tags/simple.rb
 - vendor/chromedriver/linux64/.gitkeep
 - vendor/chromedriver/linux64/chromedriver
 - vendor/chromedriver/mac64/.gitkeep

data/examples/tags/main.rb

@@ -1,2 +0,0 @@
-run "simple"
-run "block"