RubyGems - bauxite - Versions diffs - 0.6.18 → 0.6.19 - Mend

bauxite 0.6.18 → 0.6.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (205) hide show

checksums.yaml +4 -4
data/LICENSE +21 -21
data/README.md +293 -293
data/Rakefile +128 -128
data/bin/bauxite +27 -27
data/doc/Bauxite.html +6 -9
data/doc/Bauxite/Action.html +298 -315
data/doc/Bauxite/ActionModule.html +23 -26
data/doc/Bauxite/Application.html +36 -38
data/doc/Bauxite/Context.html +303 -303
data/doc/Bauxite/Errors.html +6 -9
data/doc/Bauxite/Errors/AssertionError.html +6 -9
data/doc/Bauxite/Errors/FileNotFoundError.html +6 -9
data/doc/Bauxite/Errors/FormatError.html +6 -9
data/doc/Bauxite/Loggers.html +6 -9
data/doc/Bauxite/Loggers/CompositeLogger.html +29 -32
data/doc/Bauxite/Loggers/EchoLogger.html +10 -13
data/doc/Bauxite/Loggers/FileLogger.html +25 -28
data/doc/Bauxite/Loggers/HtmlLogger.html +99 -102
data/doc/Bauxite/Loggers/NullLogger.html +16 -19
data/doc/Bauxite/Loggers/ReportLogger.html +43 -46
data/doc/Bauxite/Loggers/TerminalLogger.html +76 -79
data/doc/Bauxite/Loggers/XtermLogger.html +28 -31
data/doc/Bauxite/Parser.html +87 -89
data/doc/Bauxite/ParserModule.html +19 -22
data/doc/Bauxite/Selector.html +99 -105
data/doc/Bauxite/SelectorModule.html +27 -30
data/doc/README_md.html +117 -103
data/doc/created.rid +58 -58
data/doc/fonts.css +167 -167
data/doc/fonts/Lato-Light.ttf +0 -0
data/doc/fonts/Lato-LightItalic.ttf +0 -0
data/doc/fonts/Lato-Regular.ttf +0 -0
data/doc/fonts/Lato-RegularItalic.ttf +0 -0
data/doc/fonts/SourceCodePro-Bold.ttf +0 -0
data/doc/fonts/SourceCodePro-Regular.ttf +0 -0
data/doc/images/add.png +0 -0
data/doc/images/arrow_up.png +0 -0
data/doc/images/brick.png +0 -0
data/doc/images/brick_link.png +0 -0
data/doc/images/bug.png +0 -0
data/doc/images/bullet_black.png +0 -0
data/doc/images/bullet_toggle_minus.png +0 -0
data/doc/images/bullet_toggle_plus.png +0 -0
data/doc/images/date.png +0 -0
data/doc/images/delete.png +0 -0
data/doc/images/find.png +0 -0
data/doc/images/loadingAnimation.gif +0 -0
data/doc/images/macFFBgHack.png +0 -0
data/doc/images/package.png +0 -0
data/doc/images/page_green.png +0 -0
data/doc/images/page_white_text.png +0 -0
data/doc/images/page_white_width.png +0 -0
data/doc/images/plugin.png +0 -0
data/doc/images/ruby.png +0 -0
data/doc/images/tag_blue.png +0 -0
data/doc/images/tag_green.png +0 -0
data/doc/images/transparent.png +0 -0
data/doc/images/wrench.png +0 -0
data/doc/images/wrench_orange.png +0 -0
data/doc/images/zoom.png +0 -0
data/doc/index.html +117 -103
data/doc/js/darkfish.js +32 -11
data/doc/js/jquery.js +0 -0
data/doc/js/navigation.js +0 -0
data/doc/js/search.js +0 -0
data/doc/js/search_index.js +1 -1
data/doc/js/searcher.js +0 -0
data/doc/rdoc.css +580 -580
data/doc/table_of_contents.html +69 -72
data/lib/bauxite.rb +28 -28
data/lib/bauxite/actions/alias.rb +51 -51
data/lib/bauxite/actions/assert.rb +49 -49
data/lib/bauxite/actions/asserth.rb +60 -60
data/lib/bauxite/actions/assertm.rb +49 -49
data/lib/bauxite/actions/assertv.rb +40 -40
data/lib/bauxite/actions/assertw.rb +47 -47
data/lib/bauxite/actions/break.rb +39 -39
data/lib/bauxite/actions/capture.rb +61 -61
data/lib/bauxite/actions/click.rb +36 -36
data/lib/bauxite/actions/debug.rb +103 -103
data/lib/bauxite/actions/doif.rb +43 -43
data/lib/bauxite/actions/dounless.rb +43 -43
data/lib/bauxite/actions/echo.rb +36 -36
data/lib/bauxite/actions/exec.rb +46 -46
data/lib/bauxite/actions/exit.rb +35 -35
data/lib/bauxite/actions/failif.rb +52 -52
data/lib/bauxite/actions/js.rb +41 -41
data/lib/bauxite/actions/load.rb +49 -49
data/lib/bauxite/actions/open.rb +35 -35
data/lib/bauxite/actions/params.rb +40 -40
data/lib/bauxite/actions/replace.rb +37 -37
data/lib/bauxite/actions/reset.rb +38 -38
data/lib/bauxite/actions/return.rb +68 -68
data/lib/bauxite/actions/ruby.rb +58 -58
data/lib/bauxite/actions/select.rb +48 -48
data/lib/bauxite/actions/set.rb +39 -39
data/lib/bauxite/actions/setif.rb +44 -44
data/lib/bauxite/actions/source.rb +44 -44
data/lib/bauxite/actions/store.rb +38 -38
data/lib/bauxite/actions/submit.rb +37 -37
data/lib/bauxite/actions/test.rb +67 -67
data/lib/bauxite/actions/tryload.rb +71 -71
data/lib/bauxite/actions/wait.rb +38 -38
data/lib/bauxite/actions/write.rb +44 -44
data/lib/bauxite/application.rb +349 -349
data/lib/bauxite/core/action.rb +199 -199
data/lib/bauxite/core/context.rb +791 -791
data/lib/bauxite/core/errors.rb +41 -41
data/lib/bauxite/core/logger.rb +169 -169
data/lib/bauxite/core/parser.rb +85 -85
data/lib/bauxite/core/selector.rb +152 -152
data/lib/bauxite/loggers/composite.rb +91 -91
data/lib/bauxite/loggers/echo.rb +36 -36
data/lib/bauxite/loggers/file.rb +68 -68
data/lib/bauxite/loggers/html.rb +154 -154
data/lib/bauxite/loggers/terminal.rb +134 -134
data/lib/bauxite/loggers/xterm.rb +101 -101
data/lib/bauxite/parsers/csv.rb +43 -43
data/lib/bauxite/parsers/default.rb +42 -42
data/lib/bauxite/parsers/html.rb +79 -79
data/lib/bauxite/selectors/attr.rb +39 -39
data/lib/bauxite/selectors/frame.rb +60 -60
data/lib/bauxite/selectors/json.rb +88 -88
data/lib/bauxite/selectors/sid.rb +38 -38
data/lib/bauxite/selectors/smart.rb +80 -80
data/lib/bauxite/selectors/window.rb +77 -77
data/test/alert.bxt +3 -3
data/test/alert/page.html +4 -4
data/test/alias.bxt +9 -9
data/test/asserth.bxt +2 -2
data/test/assertv.bxt +1 -1
data/test/assertw.bxt +7 -7
data/test/broken.bxt.manual +0 -0
data/test/bug_load_path.bxt.manual +0 -0
data/test/bug_load_path/broken.bxt.manual +0 -0
data/test/bug_load_path/test.bxt +0 -0
data/test/capture.bxt.manual +20 -20
data/test/capture/my_test.bxt +1 -1
data/test/capture/page.html +6 -6
data/test/capture_on_error.bxt.manual +3 -3
data/test/capture_on_error/my_test.bxt +1 -1
data/test/capture_on_error/page.html +2 -2
data/test/debug.bxt.manual +0 -0
data/test/default_selector.bxt.manual +7 -7
data/test/default_selector/page.html +10 -10
data/test/default_selector_var.bxt +1 -1
data/test/delay.bxt +2 -2
data/test/delay/page.html +4 -4
data/test/doif.bxt +6 -6
data/test/dounless.bxt +6 -6
data/test/exec.bxt +6 -6
data/test/exit.bxt +3 -3
data/test/exit/test.bxt +3 -3
data/test/extension.bxt.manual +4 -4
data/test/extension/custom.rb +12 -12
data/test/extension/page.html +4 -4
data/test/failif.bxt +7 -7
data/test/failif/page.html +5 -5
data/test/format.bxt +17 -17
data/test/format/page.html +6 -6
data/test/frame.bxt +6 -6
data/test/frame/child_frame.html +6 -6
data/test/frame/grandchild_frame.html +4 -4
data/test/frame/page.html +4 -4
data/test/js.bxt +4 -4
data/test/json.bxt +19 -19
data/test/json/array.json +3 -3
data/test/json/object.json +13 -13
data/test/load.bxt +18 -18
data/test/load/child.bxt +12 -12
data/test/parsers.bxt +1 -1
data/test/parsers.csv +7 -7
data/test/parsers.html +32 -32
data/test/parsers/page.html +6 -6
data/test/return.bxt +1 -1
data/test/return/f1.bxt +1 -1
data/test/return/f2.bxt +1 -1
data/test/return/f3.bxt +1 -1
data/test/return/f4.bxt +2 -2
data/test/ruby.bxt +1 -1
data/test/ruby/custom.rb +5 -5
data/test/select.bxt +9 -9
data/test/select/page.html +8 -8
data/test/selectors.bxt +7 -7
data/test/selectors/page.html +6 -6
data/test/set_builtin.bxt +5 -0
data/test/set_builtin/page.html +5 -0
data/test/setif.bxt +3 -3
data/test/smart_selector.bxt +17 -17
data/test/smart_selector/page.html +17 -17
data/test/stdin.bxt +0 -0
data/test/submit.bxt +4 -4
data/test/submit/page.html +6 -6
data/test/submit/page2.html +4 -4
data/test/test.bxt.manual +6 -6
data/test/test/test1.bxt +2 -2
data/test/test/test2.bxt +3 -3
data/test/test/test3.bxt +2 -2
data/test/test/test4.bxt +1 -1
data/test/test/test5.bxt +1 -1
data/test/window.bxt +14 -14
data/test/window/page.html +5 -5
data/test/window/popup.html +4 -4
metadata +5 -3

data/lib/bauxite/actions/source.rb CHANGED Viewed

@@ -1,44 +1,44 @@
-#--
-# Copyright (c) 2014 Patricio Zavolinsky
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#++
-class Bauxite::Action
-	# Asserts that the page source matches +text+.
-	#
-	# +text+ can be a regular expression. See #assert for more details.
-	#
-	# For example:
-	#     # assuming <html><body>Hello World!</body></html>
-	#     source "Hello.*!"
-	#     # => this assertion would pass
-	#
-	# :category: Action Methods
-	def source(text)
-		@ctx.with_timeout Bauxite::Errors::AssertionError do
-			actual = @ctx.driver.page_source
-			verbose = @ctx.options[:verbose] ? "\nPage source:\n#{actual}" : ''
-			unless actual =~ _pattern(text)
-				raise Bauxite::Errors::AssertionError, "Assertion failed: page source does not match '#{text}'#{verbose}"
-			end
-			true
-		end
-	end
-end
+#--
+# Copyright (c) 2014 Patricio Zavolinsky
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+class Bauxite::Action
+	# Asserts that the page source matches +text+.
+	#
+	# +text+ can be a regular expression. See #assert for more details.
+	#
+	# For example:
+	#     # assuming <html><body>Hello World!</body></html>
+	#     source "Hello.*!"
+	#     # => this assertion would pass
+	#
+	# :category: Action Methods
+	def source(text)
+		@ctx.with_timeout Bauxite::Errors::AssertionError do
+			actual = @ctx.driver.page_source
+			verbose = @ctx.options[:verbose] ? "\nPage source:\n#{actual}" : ''
+			unless actual =~ _pattern(text)
+				raise Bauxite::Errors::AssertionError, "Assertion failed: page source does not match '#{text}'#{verbose}"
+			end
+			true
+		end
+	end
+end

data/lib/bauxite/actions/store.rb CHANGED Viewed

@@ -1,38 +1,38 @@
-#--
-# Copyright (c) 2014 Patricio Zavolinsky
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#++
-class Bauxite::Action
-	# Sets the variable named +name+ to the value of the selected element.
-	#
-	# +name+ is subject to variable expansion (see Context#expand).
-	#
-	# For example:
-	#     # assuming <span id="name">John</span>
-	#     store id=name firstName
-	#     echo "${firstName}
-	#     # => this would print 'John'
-	#
-	# :category: Action Methods
-	def store(selector, name)
-		@ctx.find(selector) { |e| @ctx.variables[name] = @ctx.get_value(e) }
-	end
-end
+#--
+# Copyright (c) 2014 Patricio Zavolinsky
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+class Bauxite::Action
+	# Sets the variable named +name+ to the value of the selected element.
+	#
+	# +name+ is subject to variable expansion (see Context#expand).
+	#
+	# For example:
+	#     # assuming <span id="name">John</span>
+	#     store id=name firstName
+	#     echo "${firstName}
+	#     # => this would print 'John'
+	#
+	# :category: Action Methods
+	def store(selector, name)
+		@ctx.find(selector) { |e| @ctx.variables[name] = @ctx.get_value(e) }
+	end
+end

data/lib/bauxite/actions/submit.rb CHANGED Viewed

@@ -1,37 +1,37 @@
-#--
-# Copyright (c) 2014 Patricio Zavolinsky
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#++
-class Bauxite::Action
-	# Submits the form that contains the selected element.
-	#
-	# For example:
-	#     # assuming <form><input id="i"/></form>
-	#     submit i
-	#     # => this would submit the form
-	#
-	# :category: Action Methods
-	def submit(selector)
-		@ctx.find(selector) do |e|
-			e.submit
-		end
-	end
-end
+#--
+# Copyright (c) 2014 Patricio Zavolinsky
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+class Bauxite::Action
+	# Submits the form that contains the selected element.
+	#
+	# For example:
+	#     # assuming <form><input id="i"/></form>
+	#     submit i
+	#     # => this would submit the form
+	#
+	# :category: Action Methods
+	def submit(selector)
+		@ctx.find(selector) do |e|
+			e.submit
+		end
+	end
+end

data/lib/bauxite/actions/test.rb CHANGED Viewed

@@ -1,67 +1,67 @@
-#--
-# Copyright (c) 2014 Patricio Zavolinsky
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#++
-class Bauxite::Action
-	# Load +file+ using the #load action into a new test context.
-	#
-	# If +name+ is specified, it will be used as the test name.
-	#
-	# An optional list of variables can be provided in +vars+. These variables
-	# will override the value of the context variables for the execution of the
-	# file (See Context#with_vars).
-	#
-	# If any action in the test context fails, the whole test context fails,
-	# and the execution continues with the next test context (if any).
-	#
-	# For example:
-	#     test mytest.bxt "My Test" my_var=1
-	#     # => this would load mytest.bxt into a new test context
-	#     #    named "My Test", and within that context ${my_var}
-	#     #    would expand to 1.
-	#
-	# :category: Action Methods
-	def test(file, name = nil, *vars)
-		delayed = load(file, *vars)
-		name = name || file
-		lambda do
-			begin
-				t = Time.new
-				status = 'ERROR'
-				error = nil
-				@ctx.with_vars({ '__TEST__' => name }) do
-					delayed.call
-					status = 'OK'
-				end
-			rescue StandardError => e
-				@ctx.print_error(e)
-				error = e
-			ensure
-				@ctx.tests << {
-					:name => name,
-					:status => status,
-					:time => Time.new - t,
-					:error => error
-				}
-			end
-		end
-	end
-end
+#--
+# Copyright (c) 2014 Patricio Zavolinsky
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+class Bauxite::Action
+	# Load +file+ using the #load action into a new test context.
+	#
+	# If +name+ is specified, it will be used as the test name.
+	#
+	# An optional list of variables can be provided in +vars+. These variables
+	# will override the value of the context variables for the execution of the
+	# file (See Context#with_vars).
+	#
+	# If any action in the test context fails, the whole test context fails,
+	# and the execution continues with the next test context (if any).
+	#
+	# For example:
+	#     test mytest.bxt "My Test" my_var=1
+	#     # => this would load mytest.bxt into a new test context
+	#     #    named "My Test", and within that context ${my_var}
+	#     #    would expand to 1.
+	#
+	# :category: Action Methods
+	def test(file, name = nil, *vars)
+		delayed = load(file, *vars)
+		name = name || file
+		lambda do
+			begin
+				t = Time.new
+				status = 'ERROR'
+				error = nil
+				@ctx.with_vars({ '__TEST__' => name }) do
+					delayed.call
+					status = 'OK'
+				end
+			rescue StandardError => e
+				@ctx.print_error(e)
+				error = e
+			ensure
+				@ctx.tests << {
+					:name => name,
+					:status => status,
+					:time => Time.new - t,
+					:error => error
+				}
+			end
+		end
+	end
+end

data/lib/bauxite/actions/tryload.rb CHANGED Viewed

@@ -1,71 +1,71 @@
-#--
-# Copyright (c) 2014 Patricio Zavolinsky
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#++
-require 'pathname'
-class Bauxite::Action
-	# Load the specified file into an isolated variable context and execute
-	# the actions specified. If the file does not exist, this action skips.
-	# See #load for a similar action that fails if the file does not exist.
-	#
-	# +file+ can be a path relative to the current test file.
-	#
-	# An optional list of variables can be provided in +vars+. These variables
-	# will override the value of the context variables for the execution of the
-	# file (See Context#with_vars).
-	#
-	# The syntax of the variable specification is:
-	#     "var1_name=var1_value" "var2_name=var2_value" ...
-	#
-	# For example:
-	#     tryload other_test.bxt
-	#     tryload nonexistent_file.bxt
-	#     # => this would load and execute other_test.bxt, then silently fail
-	#     #    to execute nonexistent_file.bxt without failing the test.
-	#
-	# :category: Action Methods
-	def tryload(file, *vars)
-		_load_file_action(file, *vars) do |f|
-			@ctx.exec_file(f)
-		end
-	end
-private
-	def _load_file_action(file, *vars)
-		unless file == 'stdin' or  (File.exists? file and Pathname.new(file).absolute?)
-			current = @ctx.variables['__FILE__']
-			current = (current and File.exists? current) ? File.dirname(current) : Dir.pwd
-			file = File.join(current, file)
-			return nil unless File.exists? file
-		end
-		var_hash = vars.inject({}) do |h,v|
-			data = v.split('=', 2)
-			h[data[0]] = data[1]
-			h
-		end
-		lambda do
-			@ctx.with_vars(var_hash) { yield file }
-		end
-	end
-end
+#--
+# Copyright (c) 2014 Patricio Zavolinsky
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+require 'pathname'
+class Bauxite::Action
+	# Load the specified file into an isolated variable context and execute
+	# the actions specified. If the file does not exist, this action skips.
+	# See #load for a similar action that fails if the file does not exist.
+	#
+	# +file+ can be a path relative to the current test file.
+	#
+	# An optional list of variables can be provided in +vars+. These variables
+	# will override the value of the context variables for the execution of the
+	# file (See Context#with_vars).
+	#
+	# The syntax of the variable specification is:
+	#     "var1_name=var1_value" "var2_name=var2_value" ...
+	#
+	# For example:
+	#     tryload other_test.bxt
+	#     tryload nonexistent_file.bxt
+	#     # => this would load and execute other_test.bxt, then silently fail
+	#     #    to execute nonexistent_file.bxt without failing the test.
+	#
+	# :category: Action Methods
+	def tryload(file, *vars)
+		_load_file_action(file, *vars) do |f|
+			@ctx.exec_file(f)
+		end
+	end
+private
+	def _load_file_action(file, *vars)
+		unless file == 'stdin' or  (File.exists? file and Pathname.new(file).absolute?)
+			current = @ctx.variables['__FILE__']
+			current = (current and File.exists? current) ? File.dirname(current) : Dir.pwd
+			file = File.join(current, file)
+			return nil unless File.exists? file
+		end
+		var_hash = vars.inject({}) do |h,v|
+			data = v.split('=', 2)
+			h[data[0]] = data[1]
+			h
+		end
+		lambda do
+			@ctx.with_vars(var_hash) { yield file }
+		end
+	end
+end