allure-rspec 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05082235365532bded92d2552c949b7805673d66
-  data.tar.gz: 7c4da451b610f0a98110e6ab3593f09787ee39e8
+  metadata.gz: 012d9f82fef3280defb7a7bf0279304b7bc5faed
+  data.tar.gz: 8b0e5ecb45a6a704abfbe64ba2438950b441f846
 SHA512:
-  metadata.gz: 65e2fa2160ee9d75d5bc5cf1691db2ca4f01d72380bf5f0408d8dcfd7673f9bd7cbcf2a56b5b891fc1891508b9f441d199cc8af5d44bf98cf6fa513805f79017
-  data.tar.gz: 28c23526a6ea7733dbf8820f31768016d11d5e8779e8dd8aae53d746cc7911c20bb5126da606cafa3c9471491d85da95c6bb7c8c69b62127ea9577353d3376e1
+  metadata.gz: daac4d24b366f3ce2cc20bf0750784df753c44a4c46dedd173dcdbdec05ab42042330185b2e9d3b508eeaf95e0991e43808e8e58f8e3f3fbeff6802b7499d8dc
+  data.tar.gz: ce94edd8becef81deadbe5230ec408081645e2f683486cbc69109f027365f60c052ee1e198a80c18f9911e670573eaac9c9764604484e9d144f7b788e31a8346

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    allure-rspec (0.4.0)
+    allure-rspec (0.4.2)
       mimemagic
       nokogiri (~> 1.6.0)
       rspec (~> 2.14.0)

data/README.md

@@ -4,6 +4,7 @@ Adaptor to use the Allure framework along with the RSpec
 
 ## What's new
 
+* *0.4.1* - Support for before/after(:step) hooks.
 * *0.3.1* - Allure 1.4.0 format support.
 
 ## Setup
@@ -38,6 +39,10 @@ your current directory.
 ```ruby
 describe MySpec do
 
+  before(:step) do |s|
+    puts "Before step #{s.current_step}"
+  end
+
   it "should be steps enabled" do
 
     step "step1" do

data/lib/allure-rspec.rb

@@ -11,17 +11,26 @@ module AllureRSpec
   module Config
     class << self
       attr_accessor :output_dir
-      attr_accessor :rspec
 
       DEFAULT_OUTPUT_DIR = 'allure/data'
 
       def output_dir
         @output_dir || DEFAULT_OUTPUT_DIR
       end
+    end
+  end
 
-      def rspec
-        @rspec
-      end
+  class Context
+    attr_accessor :rspec
+
+    def rspec
+      @rspec
+    end
+  end
+
+  class << self
+    def context
+      @context ||= Context.new
     end
   end
 

data/lib/allure-rspec/adaptor.rb

@@ -1,9 +1,9 @@
 module AllureRSpec
   module Adaptor
     def self.included(base)
-      AllureRSpec::Config.rspec = base
+      AllureRSpec.context.rspec = base
       base.send :include, AllureRSpec::DSL
-      if RSpec.configuration.formatters.find_all {|f| f.is_a?(AllureRSpec::Formatter)}.empty?
+      if RSpec.configuration.formatters.find_all { |f| f.is_a?(AllureRSpec::Formatter) }.empty?
         RSpec.configuration.add_formatter(AllureRSpec::Formatter)
       end
       RSpec::Core::ExampleGroup.send :include, AllureRSpec::Hooks

data/lib/allure-rspec/builder.rb

@@ -13,28 +13,29 @@ module AllureRSpec
         }
       end
 
-      def start_suite(title)
+      def start_suite(title, labels = [:severity => :normal])
         init_suites
         MUTEX.synchronize do
-          puts "Starting suite #{title}"
+          puts "Starting case_or_suite #{title} with labels #{labels}"
           self.suites[title] = {
               :title => title,
               :start => timestamp,
               :tests => {},
+              :labels => labels
           }
         end
       end
 
-      def start_test(suite, test, severity = :normal)
+      def start_test(suite, test, labels = [:severity => :normal])
         MUTEX.synchronize do
-          puts "Starting test #{suite}.#{test}"
+          puts "Starting test #{suite}.#{test} with labels #{labels}"
           self.suites[suite][:tests][test] = {
               :title => test,
               :start => timestamp,
-              :severity => severity,
               :failure => nil,
               :steps => {},
-              :attachments => []
+              :attachments => [],
+              :labels => labels,
           }
         end
       end
@@ -65,13 +66,12 @@ module AllureRSpec
         text
       end
 
-      def start_step(suite, test, step, severity = :normal)
+      def start_step(suite, test, step)
         MUTEX.synchronize do
           puts "Starting step #{suite}.#{test}.#{step}"
           self.suites[suite][:tests][test][:steps][step] = {
               :title => step,
               :start => timestamp,
-              :severity => severity || :normal,
               :attachments => []
           }
         end
@@ -102,7 +102,7 @@ module AllureRSpec
       def stop_suite(title)
         init_suites
         MUTEX.synchronize do
-          puts "Stopping suite #{title}"
+          puts "Stopping case_or_suite #{title}"
           self.suites[title][:stop] = timestamp
         end
       end
@@ -134,26 +134,17 @@ module AllureRSpec
                         xml.step(:start => step_obj[:start] || 0, :stop => step_obj[:stop] || 0, :status => step_obj[:status]) do
                           xml.send :name, step_title
                           xml.send :title, step_title
-                          xml.attachments do
-                            step_obj[:attachments].each do |attach|
-                              xml.attachment :source => attach[:source], :title => attach[:title], :size => attach[:size], :type => attach[:type]
-                            end
-                          end
+                          xml_attachments(xml, step_obj[:attachments])
                         end
                       end
                     end
-                    xml.attachments do
-                      test[:attachments].each do |attach|
-                        xml.attachment :source => attach[:source], :title => attach[:title], :size => attach[:size], :type => attach[:type]
-                      end
-                    end
-                    xml.labels do
-                      xml.label :name => "severity", :value => test[:severity]
-                    end
+                    xml_attachments(xml, test[:attachments])
+                    xml_labels(xml, suite[:labels].merge(test[:labels]))
                     xml.parameters
                   end
                 end
               end
+              xml_labels(xml, suite[:labels])
             end
           end
           xml = builder.to_xml
@@ -162,6 +153,30 @@ module AllureRSpec
         end
         suites_xml
       end
+
+      private
+
+      def xml_attachments(xml, attachments)
+        xml.attachments do
+          attachments.each do |attach|
+            xml.attachment :source => attach[:source], :title => attach[:title], :size => attach[:size], :type => attach[:type]
+          end
+        end
+      end
+
+      def xml_labels(xml, labels)
+        xml.labels do
+          labels.each do |name, value|
+            if value.is_a?(Array)
+              value.each do |v|
+                xml.label :name => name, :value => v
+              end
+            else
+              xml.label :name => name, :value => value
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/allure-rspec/dsl.rb

@@ -2,7 +2,6 @@ require 'digest'
 require 'mimemagic'
 module AllureRSpec
   module DSL
-
     def __mutex
       @@__mutex ||= Mutex.new
     end
@@ -19,10 +18,10 @@ module AllureRSpec
       __mutex.synchronize do
         begin
           @@__current_step = step
-          Config.rspec.send :run_hook, :before, :step, example
+          AllureRSpec.context.rspec.send :run_hook, :before, :step, example
           yield
         ensure
-          Config.rspec.send :run_hook, :after, :step, example
+          AllureRSpec.context.rspec.send :run_hook, :after, :step, example
           @@__current_step = nil
         end
       end

data/lib/allure-rspec/formatter.rb

@@ -6,6 +6,8 @@ module AllureRSpec
 
   class Formatter < RSpec::Core::Formatters::BaseFormatter
 
+    ALLOWED_LABELS = [:feature, :story, :severity, :language, :framework]
+
     def example_failed(example)
       AllureRSpec::Builder.stop_test(
           example.metadata[:example_group][:description_args].first,
@@ -24,7 +26,7 @@ module AllureRSpec
     end
 
     def example_group_started(group)
-      AllureRSpec::Builder.start_suite(group.metadata[:example_group][:description_args].first)
+      AllureRSpec::Builder.start_suite(group.metadata[:example_group][:description_args].first, labels(group))
       super
     end
 
@@ -44,7 +46,7 @@ module AllureRSpec
     def example_started(example)
       suite = example.metadata[:example_group][:description_args].first
       test = example.metadata[:description]
-      AllureRSpec::Builder.start_test(suite, test)
+      AllureRSpec::Builder.start_test(suite, test, labels(example))
       super
     end
 
@@ -62,15 +64,24 @@ module AllureRSpec
           file.write(xml)
         end
 
-        #xsd = Nokogiri::XML::Schema(File.read("allure-model.xsd"))
-        #doc = Nokogiri::XML(File.read(out_file))
-        #
-        #xsd.validate(doc).each do |error|
-        #  puts error.message
-        #end
+        xsd = Nokogiri::XML::Schema(File.read(Pathname.new(File.dirname(__FILE__)).join("../../allure-model.xsd")))
+        doc = Nokogiri::XML(File.read(out_file))
+
+        xsd.validate(doc).each do |error|
+          $stderr.puts error.message
+        end
       end
       super
     end
 
+    private
+
+    def labels(example_or_group)
+      ALLOWED_LABELS.
+          map { |label| [label, example_or_group.metadata[label]] }.
+          find_all { |value| !value[1].nil? }.
+          inject({}) { |res, value| res.merge(value[0] => value[1]) }
+    end
+
   end
 end

data/lib/allure-rspec/version.rb

@@ -1,5 +1,5 @@
 module AllureRSpec # :nodoc:
   module Version # :nodoc:
-    STRING = '0.4.1'
+    STRING = '0.4.2'
   end
 end

data/spec/another_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'tempfile'
 
-describe "Some another spec" do
+describe "Some another spec", :feature => ["Some Feature"], :severity => :normal do
 
   before(:each) do
     puts "before each"
@@ -11,7 +11,7 @@ describe "Some another spec" do
     puts "after each"
   end
 
-  it "10 cannot be greater than 19" do
+  it "10 cannot be greater than 19", :story => ["Some story"]  do
     10.should > 19
   end
 

data/spec/extend_steps_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'tempfile'
 
-describe AllureRSpec do
+describe AllureRSpec, :feature => "Basics" do
 
   before(:suite) do
     puts "before suite"
@@ -35,7 +35,7 @@ describe AllureRSpec do
     puts "after all"
   end
 
-  it "should build" do
+  it "should build", :story => "Main story" do
     attach_file "test-file1", Tempfile.new("test")
     step "step1" do
       attach_file "test-file2", Tempfile.new("test")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allure-rspec
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Ilya Sadykov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -141,5 +141,5 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: allure-rspec-0.4.1
+summary: allure-rspec-0.4.2
 test_files: []