testingmachine 0.1.9 → 0.1.10

data/TODO

@@ -1,4 +1,7 @@
-1, more table parser adapters: excel sql(web interface)?
-2, support multi tables?
+1, more table parser adapters: excel sql(web interface)
+2, support multi tables???
 3, rake task
-4, write more test
+4, generator without rails
+5, only run one test case?
+6, email error message
+7, parallel, distributed test

data/bin/tm

@@ -5,10 +5,18 @@ require File.expand_path('../lib/tm',File.dirname(__FILE__))
 options = {}
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: tm -t types file1 file2 / directoris"
+  opts.banner = "Usage: tm -t tag1,tag2 spec_file"
 
-  opts.on( '-t', '--type types', 'types' ) do |types|
-    TM::Configuration.types = types.split(',').map(&:to_s)
+  opts.on( '-t', '--tags tags', 'tags' ) do |tag|
+    TM::Configuration.tags = (TM::Configuration.tags || []).concat tag.split(',')
+  end
+
+  opts.on( '-d', '--data data', 'data' ) do |data|
+    TM::Configuration.data = data
+  end
+
+  opts.on( '-n', '--name name', 'only execute the feature elements which match part of the given name.' ) do |name|
+    TM::Configuration.names = (TM::Configuration.names || []).concat name.to_a
   end
 
   opts.on( '-h', '--help', 'Display this screen' ) do

data/lib/generators/testing_machine/templates/config.yml

@@ -1,4 +1,4 @@
-types:
+tags:
   all:
     capybara:
       asset_root: 'tmp'

data/lib/tm.rb

@@ -11,11 +11,21 @@ Capybara.default_driver = :selenium
 MiniTest::Unit.autorun
 
 module TM
-  def self.should_run_type?(types)
-    return true  if TM::Configuration.types.nil?
-    return false if types.nil?
-    types = types.to_a.map(&:to_s)
-    (types - TM::Configuration.types) != types
+  def self.should_run?(tags=nil, name=nil)
+    should_run_tags?(tags) && should_run_name?(name)
+  end
+
+  protected
+  def self.should_run_tags?(tags)
+    return true  if TM::Configuration.tags.nil?
+    return false if tags.nil?
+    tags = tags.to_a.map(&:to_s)
+    (tags - TM::Configuration.tags) != tags
+  end
+
+  def self.should_run_name?(name)
+    return true if TM::Configuration.names.nil?
+    TM::Configuration.names.to_a.include?(name)
   end
 end
 
@@ -24,12 +34,16 @@ class MiniTest::Spec
 
 	class << self
 		def scenario desc, opts = {}, &block
-      return unless TM.should_run_type?(opts[:type])
-      TM::Configuration.load_setting_for_types(opts[:type])
+      return unless TM.should_run?(opts[:tag], desc)
+      TM::Configuration.load_setting_for_tags(opts[:tag])
       test_file = File.expand_path(caller[0].sub(/:.*$/,''))
 
       it desc do
-        data_table = TM::Table[test_file, desc]
+        if TM::Configuration.data
+          data_table = eval("TM::Table[test_file, desc][#{TM::Configuration.data}].to_a")
+        else
+          data_table = TM::Table[test_file, desc]
+        end
 
         if !data_table.empty?
           data_table.map do |example|
@@ -47,7 +61,7 @@ class MiniTest::Spec
     alias :Scenario :scenario
 
     def background type = :each, opts = {}, &block
-      return unless TM.should_run_type?(opts[:type])
+      return unless TM.should_run?(opts[:tag])
 
       before type do
         self.instance_exec(&block)

data/lib/tm/configuration.rb

@@ -3,7 +3,7 @@ require 'yaml'
 module TM
   class Configuration
     class << self
-      attr_accessor :types, :root
+      attr_accessor :tags, :names, :root, :data
 
       def root
 				test_path = File.expand_path('testingmachine')
@@ -22,10 +22,10 @@ module TM
         return {}
       end
 
-      def load_setting_for_types(types=[])
-        types = types.to_a.unshift(:all)
-        types.map do |type|
-          config = self.config['types'] && self.config['types'][type.to_s]
+      def load_setting_for_tags(tags=[])
+        tags = tags.to_a.unshift(:all)
+        tags.map do |tag|
+          config = self.config['tags'] && self.config['tags'][tag.to_s]
           load_config(config)
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testingmachine
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Jinzhu