moto 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90fe2561282622f310e6d74d3061dd718e9b3477
-  data.tar.gz: 75c338461cbd7f97af43f09fe6e3bf455bd0b246
+  metadata.gz: 2e56d7e5033affe7722147e62069dce0abb867a0
+  data.tar.gz: 1b24b5d96561c51bc981df29d20956d942440e9d
 SHA512:
-  metadata.gz: a798e654af8a5243ff1f9b465f7cfc5ad82357323d72a3973fa4d1d36e306facb90289f20150a446c39a268af6fc45d7ef849baf1454ae4e14047357966003cf
-  data.tar.gz: b955b5b207d99921e73764adda6499c28559372c63f84a46dac095d7a36b39cafa71d967078d2afc5da474d13b450672169f28005cca5e07773d5e0c9632293f
+  metadata.gz: 94fd8eed59186ccd6699b9d76319a01695745a97dc3c6c0cc9127abea6fc0126c5ef2b44c75a6e6dde71e9a11ebef0180c6580b5fdd1be2dc86219e0db84adef
+  data.tar.gz: fdcc3abc7f4ffecfc93f9c50a4d0974bd84e967f7664fc1235d160741da4cf0b74534a351df02f4b60c175e35723aff61749bebb0f77cbfb7f55535167139c3e

data/lib/cli.rb

@@ -1,7 +1,7 @@
 # TODO: fix this dumb verification of current working directory
 unless File.exists? "#{Dir.pwd}/config/moto.rb"
-  puts "Config file (config/moto.rb) not present."
-  puts "Does current working directory contain Moto application?"
+  puts 'Config file (config/moto.rb) not present.'
+  puts 'Does current working directory contain Moto application?'
   exit 1
 end
 
@@ -46,23 +46,56 @@ require_relative './exceptions/test_forced_passed'
 module Moto
 
   class Cli
-  
     def self.run(argv)
-      tests = []
-        argv[ :tests ].each do |test_name|
-        test_class_name = test_name
-              
-        tg = TestGenerator.new(MotoApp::DIR)
-        t = tg.generate(test_class_name)      
-        tests << t
+      test_paths_absolute = []
+      test_classes = []
+
+      unless argv[ :tests ].nil?
+        argv[ :tests ].each do |dir_name|
+          test_paths = Dir.glob("#{MotoApp::DIR}/tests/#{dir_name}/**/*.rb")
+          test_paths -= test_paths_absolute
+          test_paths_absolute += test_paths
+        end
       end
-      
+
+      # TODO Optimization for files without #MOTO_TAGS
+      unless argv[ :tags ].nil?
+        tests_total = Dir.glob("#{MotoApp::DIR}/tests/**/*.rb")
+        argv[ :tags ].each do |tag_name|
+          tests_total.each do |test_dir|
+            test_body = File.read (test_dir)
+            test_body.each_line do |line|
+              line = line.delete(' ')
+              if line.include?( '#MOTO_TAGS')
+                if line.include? (tag_name + ',')
+                  test_paths_absolute.include?(test_dir) || test_paths_absolute << test_dir
+                  break
+                else
+                  break
+                end
+              end
+            end
+          end
+        end
+      end
+
+      #TODO Display criteria used
+      if test_paths_absolute.empty?
+        puts 'No tests found for given arguments'
+        exit 1
+      end
+
+      tg = TestGenerator.new(MotoApp::DIR)
+      test_paths_absolute.each do |test_path|
+        test_classes << tg.generate(test_path)
+      end
+
       listeners = []
       argv[ :reporters ].each do |r|
         listeners << r.constantize
       end
       
-      runner = Moto::Runner.new(tests, listeners, argv[ :environments ], argv[ :config ])
+      runner = Moto::Runner.new(test_classes, listeners, argv[ :environments ], argv[ :config ])
       runner.run
     end
   

data/lib/clients/website.rb

@@ -1,47 +1,47 @@
-require 'capybara'
-
-module Moto
-  module Clients
-	
-  	class Website < Moto::Clients::Base
-
-      attr_reader :session
-      
-      ignore_logging(:page)
-      ignore_logging(:context)
-      ignore_logging(:session)
-  		 		
-      def start_run
-        # TODO: make session driver configurable
-        @session = Capybara::Session.new(context.runner.my_config[:capybara][:default_driver])
-        @pages = {}
-      end
-      
-      def end_run
-        @session.driver.browser.close # TODO: check that it really works
-      end
-      
-      def start_test(test)
-        # @context.current_test.logger.info("Hi mom, I'm opening some pages!")
-        @session.reset_session!
-      end
-  
-      def end_test(test)
-        @session.reset_session!
-      end   
-  		
-  		def page(p)
-  		  page_class_name = "#{self.class.name}Pages::#{p}"
-  		  page_class_name.gsub!('Moto::', 'MotoApp::')
-  		  if @pages[page_class_name].nil?
-          a = page_class_name.underscore.split('/')
-          page_path = a[1..20].join('/')
-          require "#{MotoApp::DIR}/lib/#{page_path}"	    
-  		    @pages[page_class_name] = page_class_name.constantize.new(self)
-  		  end
-  		  @pages[page_class_name]
-  		end
-  		
-  	end
-  end
-end
+require 'capybara'
+
+module Moto
+  module Clients
+	
+  	class Website < Moto::Clients::Base
+
+      attr_reader :session
+      
+      ignore_logging(:page)
+      ignore_logging(:context)
+      ignore_logging(:session)
+  		 		
+      def start_run
+        # TODO: make session driver configurable
+        @session = Capybara::Session.new(context.runner.my_config[:capybara][:default_driver])
+        @pages = {}
+      end
+      
+      def end_run
+        @session.driver.browser.close # TODO: check that it really works
+      end
+      
+      def start_test(test)
+        # @context.current_test.logger.info("Hi mom, I'm opening some pages!")
+        @session.reset_session!
+      end
+  
+      def end_test(test)
+        @session.reset_session!
+      end   
+  		
+  		def page(p)
+  		  page_class_name = "#{self.class.name}Pages::#{p}"
+  		  page_class_name.gsub!('Moto::', 'MotoApp::')
+  		  if @pages[page_class_name].nil?
+          a = page_class_name.underscore.split('/')
+          page_path = a[1..20].join('/')
+          require "#{MotoApp::DIR}/lib/#{page_path}"	    
+  		    @pages[page_class_name] = page_class_name.constantize.new(self)
+  		  end
+  		  @pages[page_class_name]
+  		end
+  		
+  	end
+  end
+end

data/lib/parser.rb

@@ -12,17 +12,18 @@ module Moto
             
       # TODO Generate app / Change the way parsing options goes so it doesnt generate them if they`re not needed
       case argv[0]
-      when 'run' then Moto::Cli.run run_parse(argv)
-      when 'help' then show_help
-      when 'generate' then Moto::AppGenerator.run generate_parse(argv)
+        when 'run' then Moto::Cli.run run_parse(argv)
+        when 'help' then show_help
+        when 'generate' then Moto::AppGenerator.run generate_parse(argv)
+        else puts "Command '#{argv[0]}' not recognized. Type help for list of supported commands."
       end
     end
     
-    def self.run_parse(argv)   
-      # puts Moto::DIR
-      # Default options 
+    def self.run_parse(argv)
+      # Default options
       options = {}
-      options[:reporters] = [] 
+      options[:reporters] = []
+      # TODO Mandatory env var in app config
       options[:config] = eval(File.read("#{MotoApp::DIR}/config/moto.rb"))
       options[:environments] = []
          
@@ -31,12 +32,19 @@ module Moto
       # TODO const 
       # TODO reporters should be consts - not strings
       OptionParser.new do |opts|       
-          opts.on('-t', "--tests Tests", Array) { |v| options[:tests ] = v }
+          opts.on('-t', '--tests Tests', Array) { |v| options[:tests ] = v }
+          opts.on('-g', '--tags Tags', Array) { |v| options[:tags ] = v }
           opts.on('-r', '--reporters Reporters', Array) { |v| options[:reporters] = v }
           opts.on('-e', '--environments Environment', Array) { |v| options[:environments] = v }
           opts.on('-c', '--const Const') { |v| options[:const] = v }
           opts.on('-cfg', '--config Config') { |v| options[:config] = options[:config].merge( eval( v ) ) }
       end.parse!
+
+      if options[ :config ][ :moto ][ :runner ][ :mandatory_environment ] && options[ :environments ].empty?
+        puts 'Environment is mandatory for this project.'
+        exit 1
+      end
+
       return options
     end
     

data/lib/test_generator.rb

@@ -35,13 +35,8 @@ module Moto
     end
     
     # assuming that target file includes only content of method 'run' and some magic comments
-    def generate(class_name)
-      full_class_name = 'MotoApp::Tests::'+class_name
-      a = full_class_name.underscore.split('/')
-      test_path = (a[1..20]+[a[-1]]).join('/')
-      test_path = "#{MotoApp::DIR}/#{test_path}.rb"
-
-      method_body = File.read(test_path) + "\n"
+    def generate(test_path_absolute)
+      method_body = File.read(test_path_absolute) + "\n"
 
       base = Moto::Test
       base_class_string = method_body.match( /^#\s*BASE_CLASS:\s(\S+)/ )
@@ -49,24 +44,24 @@ module Moto
         base_class_string = base_class_string[1].strip
         
         a = base_class_string.underscore.split('/')
-        base_test_path = a[1..20].join('/')
+        base_test_path = a[1..-1].join('/')
         
         require "#{MotoApp::DIR}/lib/#{base_test_path}" 
         base = base_class_string.constantize
       end
 
       # MotoApp::Tests::Login::Short
-      consts = full_class_name.split('::')
+      consts = test_path_absolute.camelize.split('Tests::')[1].split('::')
+      consts.pop
       class_name = consts.pop
 
-      consts.shift 2 # remove Moto::Test as already defined
       m = create_module_tree(MotoApp::Tests, consts)
       cls = Class.new(base)
       m.const_set(class_name.to_sym, cls)
       
       test_object = cls.new
       test_object.instance_eval( "def run\n  #{method_body} \n end" )
-      test_object.static_path = test_path
+      test_object.static_path = test_path_absolute
       test_object
     end
     

data/lib/thread_context.rb

@@ -14,8 +14,10 @@ module Moto
       @tests.each do |t|
         t.context = self
       end
-      # TODO: add all *.yml files from that dir
-      @config = YAML.load_file("#{MotoApp::DIR}/config/const.yml")
+      @config = {}
+      Dir.glob("config/*.yml").each do |f|
+        @config.merge! YAML.load_file(f)
+      end
     end
     
     def client(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.15
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Moto - yet another web testing framework