superbara 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27a8bbaf155457a0bb1dcb511c4e4081b6c8631d4caf71c29dc4a4cb37a7ee60
-  data.tar.gz: 93338098098c6d467b293367234c1f8690c5ecb1517004c83460edfff9c93faa
+  metadata.gz: 8f4295350bebd45aadb239fbcc40fc37ff90d5ff68a3034fedfc00aafedc5126
+  data.tar.gz: 74cb152022563849a2dce5d9944ecd3b5b81c8631133d1091522e5391d6a8132
 SHA512:
-  metadata.gz: e5ae25605b3be93f76251dae87287e1c7010f22959a5b944f0bbb8c505e70c3e2f9b03b946452fa6d7b96bda296841f3813343ff73e734c9b9ed8e687a18db56
-  data.tar.gz: d8a4b309d2087703461700df621dc197464405aa2530f98e111c0581f6f2d302b5200c82de17454403004aeb13ded29f70df8e44c55d7f24464b9b3b6dc860c1
+  metadata.gz: a44befc00835d55eddedc686dda81c74b7c4a4e52a16446a124e33c4e9702c8fa2c041219b18f799876bcafcbdb256cb0a4b2f4a93629b98d4a351e07bebbb64
+  data.tar.gz: 42c74aa672ef8c84db20aedd5df80e15aaf2b1d94b79f326dc7252cc8ca276611c44323ca92704526b4da8d8855a484d48bd98183aac56f3803e7949bb09855c

data/Gemfile.lock

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

data/examples/sites/vr.fi/helsinki-tampere/main.rb

@@ -1,6 +1,6 @@
 visit 'vr.fi'
 
-languages = wait 3 do
+languages = wait do
   find("div.langbox")
 end
 
@@ -16,6 +16,6 @@ type "tamp", :down, :enter
 
 type :enter
 
-wait 5 do
+wait 10 do
   has_text? "Outbound journey:  Helsinki → Tampere"
 end

data/lib/superbara/context.rb

@@ -21,6 +21,14 @@ sleep 0.0001
       end
     end
 
+    params.each_pair do |k,v|
+      eval = "@#{k} = "
+      eval << "'" if v.class == String
+      eval << v
+      eval << "'" if v.class == String
+      Superbara.main.instance_eval "@#{k} = #{eval}"
+    end
+
     begin
       load path, true
     rescue Superbara::Errors::NotDesiredTagError
@@ -28,7 +36,7 @@ sleep 0.0001
     end
 
     params.each_pair do |k,v|
-      Superbara.main.instance_eval "undef #{k.to_sym}"
+      Superbara.main.instance_eval "remove_instance_variable '@#{k}'"
     end
   end
 

data/lib/superbara/dsl.rb

@@ -117,6 +117,7 @@ return Array.from(
       Superbara.project_path = File.dirname(better_what)
     end
 
+    error_happened = false
     begin
       Superbara.current_context.__superbara_load(better_what, params)
     rescue Exception => ex
@@ -126,11 +127,19 @@ return Array.from(
         #TODO: output to support "colored tags" and nesting
         Superbara.output colored_output
         Superbara.errored_runs << what
+        error_happened = true
       else
         raise ex
       end
     end
+
     Superbara.project_path = old_project_path
+
+    if error_happened
+      false
+    else
+      true
+    end
   end
 
   def visit(visit_uri_or_domain_or_path)

data/lib/superbara/version.rb

@@ -1,3 +1,3 @@
 module Superbara
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/tests/envs/on_error/main.rb

@@ -1,3 +1,15 @@
-run "first_failing"
-run "second_ok"
-run "third_failing"
+first = run "first_failing"
+second = run "second_ok"
+third = run "third_failing"
+
+assert do
+  first == false
+end
+
+assert do
+  second == true
+end
+
+assert do
+  third == false
+end

data/tests/run/has_instance_variables.rb

@@ -0,0 +1,7 @@
+assert do
+  @first == "hello"
+end
+
+assert do
+  @second == "world"
+end

data/tests/run/has_no_instance_variables.rb

@@ -0,0 +1,7 @@
+assert do
+  @first.nil?
+end
+
+assert do
+  @second.nil?
+end

data/tests/run/main.rb

@@ -1,2 +1,2 @@
-run "has_locals", first: "hello", second: "world"
-run "has_no_locals"
+run "has_instance_variables", first: "hello", second: "world"
+run "has_no_instance_variables"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superbara
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Matti Paksula
@@ -354,8 +354,8 @@ files:
 - tests/features/type.rb
 - tests/features/wait.rb
 - tests/minimal/main.rb
-- tests/run/has_locals.rb
-- tests/run/has_no_locals.rb
+- tests/run/has_instance_variables.rb
+- tests/run/has_no_instance_variables.rb
 - tests/run/main.rb
 - vendor/chromedriver/linux64/.gitkeep
 - vendor/chromedriver/linux64/chromedriver

data/tests/run/has_locals.rb

@@ -1,7 +0,0 @@
-assert do
-  first == "hello"
-end
-
-assert do
-  second == "world"
-end

data/tests/run/has_no_locals.rb

@@ -1,7 +0,0 @@
-assert do
-  ! respond_to? :first
-end
-
-assert do
-  ! respond_to? :second
-end