Changed 'context' to 'contexts'

lib/tack/adapters/shoulda_adapter.rb

@@ -77,9 +77,9 @@ def tests_for(file)
           tests += tests_for_class
         end
         tests.each do |test|
-          _, context, _ = test
-          context.first.sub!(Tack::Sandbox.prefix,'')
-          context.delete("")
+          _, contexts, _ = test
+          contexts.first.sub!(Tack::Sandbox.prefix,'')
+          contexts.delete("")
         end
         tests
       ensure

lib/tack/adapters/test_unit_adapter.rb

@@ -26,41 +26,41 @@ def tests_for(file)
         tests
       end
 
-      def run(path, context, description)
+      def run(path, contexts, description)
         results = Tack::ResultSet.new
         test_classes_for(path).each do |klass|
-          if klass.to_s==context.first
-            run_tests_for_class(klass, path, context, description, results)
+          if klass.to_s==contexts.first
+            run_tests_for_class(klass, path, contexts, description, results)
           end
         end
         basics(results)
       end
 
       private
 
-      def run_tests_for_class(klass, path, context, description, results)
+      def run_tests_for_class(klass, path, contexts, description, results)
         begin
           test = klass.new(description)
         rescue NameError
-          raise NoMatchingTestError, Tack::Util::Test.new(path,context,description) 
+          raise NoMatchingTestError, Tack::Util::Test.new(path,contexts,description) 
         end
         result = ::Test::Unit::TestResult.new
 
         result.add_listener(::Test::Unit::TestResult::FAULT) do |failure|
-          results.failed << build_result(path, context, description, failure)
+          results.failed << build_result(path, contexts, description, failure)
         end
 
         test.run(result) do |started,name|
           # We do nothing here
           # but this method requires a block
         end
         if result.passed?
-          results.passed << build_result(path, context, description)
+          results.passed << build_result(path, contexts, description)
         end
       end
 
-      def build_result(file, context, description, failure=nil)
-        { :test => [file.to_s, context, description],
+      def build_result(file, contexts, description, failure=nil)
+        { :test => [file.to_s, contexts, description],
           :failure => build_failure(failure) }
       end
 

lib/tack/formatters/print_pending.rb

@@ -8,8 +8,9 @@ class PrintPending
       def run_suite(tests)
         returning @app.run_suite(tests) do |results|
           results[:pending].each do |result|
-            file, context, description = result[:test]
-            @output.puts "PENDING: #{[context<<description].join(" ")}"
+            file, contexts, description = result[:test]
+            # TODO - use Test#name
+            @output.puts "PENDING: #{[contexts<<description].join(" ")}"
           end
         end
       end

lib/tack/formatters/profiler.rb

@@ -24,9 +24,9 @@ def run_suite(tests)
         end
       end
 
-      def run_test(file, context, description)
+      def run_test(file, contexts, description)
         time = Time.now
-        returning @app.run_test(file, context, description) do 
+        returning @app.run_test(file, contexts, description) do 
           @times << [description, Time.now - time]
         end
       end

lib/tack/formatters/progress_bar.rb

@@ -16,10 +16,11 @@ def run_suite(tests)
         end
       end
 
-      def run_test(file, context, description)
-        returning @app.run_test(file, context, description) do |result|
+      def run_test(file, contexts, description)
+        returning @app.run_test(file, contexts, description) do |result|
           if @verbose
-            @output.print("#{context.join(' ')} #{description}: ")
+            # TODO - replace with Test#name
+            @output.print("#{contexts.join(' ')} #{description}: ")
           end
           print_char_for_results(result[:passed], '.')
           print_char_for_results(result[:pending], 'P')

lib/tack/middleware/base.rb

@@ -13,8 +13,8 @@ def run_suite(tests)
         @app.run_suite(tests)
       end
 
-      def run_test(file, context, description)
-        @app.run_test(file, context, description)
+      def run_test(file, contexts, description)
+        @app.run_test(file, contexts, description)
       end
 
       # not necessary for the middleware API, but handy for 

lib/tack/middleware/fork.rb

@@ -5,20 +5,20 @@ module Middleware
     class Fork
       include Middleware::Base
 
-      def run_test(file, context, description)
+      def run_test(file, contexts, description)
         @reader, @writer = IO.pipe
         if @child = fork
           proceed_as_parent
         else
-          proceed_as_child(file,context, description)
+          proceed_as_child(file,contexts, description)
         end
       end
 
       private
 
-      def proceed_as_child(file, context, description)
+      def proceed_as_child(file, contexts, description)
         @reader.close
-        result = @app.run_test(file, context, description)
+        result = @app.run_test(file, contexts, description)
         Marshal.dump([:ok, result], @writer)
       rescue Object => error
         Marshal.dump([

lib/tack/runner.rb

@@ -27,8 +27,8 @@ def run(tests)
 
     def run_suite(tests)
       results = ResultSet.new
-      tests.each do |path, context, description|
-        result = @start_app.run_test(path, context, description)
+      tests.each do |path, contexts, description|
+        result = @start_app.run_test(path, contexts, description)
         results.merge(result)
       end
       basics(results)

lib/tack/test.rb

@@ -4,29 +4,29 @@ module Util
 
     class Test
 
-      attr_accessor :file, :context, :description
+      attr_accessor :file, :contexts, :description
 
       def initialize(*args)
         if args.length == 1
           if args.first.is_a?(Hash)
             opts = args.first
             @file = opts.fetch(:file) {''}
-            @context = opts.fetch(:context) {[]}
+            @contexts = opts.fetch(:contexts) {[]}
             @description = opts.fetch(:description) {''}
           elsif args.first.is_a?(Enumerable)
-            @file, @context, @description = args.first
+            @file, @contexts, @description = args.first
           end
         else
-          @file, @context, @description = args
+          @file, @contexts, @description = args
         end
       end
 
       def to_basics
-        [file, context, description].map {|x| basics(x)}
+        [file, contexts, description].map {|x| basics(x)}
       end
 
       def name
-        "#{context.join(' ')} #{description}"
+        "#{contexts.join(' ')} #{description}"
       end
 
     end

test/blueprints.rb

@@ -3,7 +3,7 @@
 
 Tack::Util::Test.blueprint do
   file 'foo.rb'
-  context ['FooTest']
+  contexts ['FooTest']
   description 'test1'
 end
 

test/unit/test_test.rb

@@ -9,23 +9,23 @@ class TestTest < Test::Unit::TestCase
     should "work with args" do
       test = Test.new('file',['Class','context'],'description')
       assert_equal 'file', test.file
-      assert_equal ['Class','context'], test.context
+      assert_equal ['Class','context'], test.contexts
       assert_equal 'description', test.description
     end
 
     should "work with args array" do
       test = Test.new(['file',['Class','context'],'description'])
       assert_equal 'file', test.file
-      assert_equal ['Class','context'], test.context
+      assert_equal ['Class','context'], test.contexts
       assert_equal 'description', test.description
     end
 
     should "work with args hash" do
       test = Test.new(:file => 'file',
-                      :context => ['Class','context'],
+                      :contexts => ['Class','context'],
                       :description => 'description')
       assert_equal 'file', test.file
-      assert_equal ['Class','context'], test.context
+      assert_equal ['Class','context'], test.contexts
       assert_equal 'description', test.description
     end