qaxqa 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 409afbda05836886fdf360aad8b0ed9efa2d8d49
-  data.tar.gz: a2efffbf3a61e1818c65f6e543bec76bce0b31fe
+  metadata.gz: 65c7e6593d86bb8f6e82dbd4e10ccb9697fe5f22
+  data.tar.gz: c2110cf9836ad4e27fdd5ac810ba55926cffbc26
 SHA512:
-  metadata.gz: d1ed8f65b873d33acbd190ed58e6acfa8185b56c6790d5c05e9a50154c95cef922d355f2181b83e4cff3181caade9b7d24549287eb9fc8840adb3d0604d6b5ac
-  data.tar.gz: 654aaf984f4aaad10f4f8fb7b4b2b839cfafdd21dfc2c67067ca892310f32704f0700e9f9afff5e8f614cf9f0ce48b727f35ff8147fc1865ec05659d10b5efb6
+  metadata.gz: f1c2963433505ee554877d7274ea725292f2f20013f600cf3dd9c39546ca5e109e4fd9aee669e1570e8b6235b91b499d8b1681afea231c46b45ed3a9caf99c48
+  data.tar.gz: 578414e0aa6818a4e200ef49c8ccf542ee6086b4d3aef82e2b25645ce3f9b2444b47528554ed09f8a7eac4fcf5e4d89e80161c8006fcd629968d0015a7bc0d8f

data/lib/qaxqa/cli/migrate.rb

@@ -1,4 +1,3 @@
-require 'byebug'
 require 'qaxqa/all_suite'
 module Qaxqa
     # Migrate given xml files and outputs to XLS HP Quality Center format
@@ -13,6 +12,23 @@ module Qaxqa
 
         private
 
+        def insert_cases(ws, cases, line)
+            cases.each_with_index do |tc|
+                tc.steps.each_with_index do |step|
+                    line +=1
+                    ws.add_cell(line, 0, tc.subject)
+                    ws.add_cell(line, 1, tc.test_name)
+                    ws.add_cell(line, 2, tc.summary)
+                    ws.add_cell(line, 3, tc.preconditions)
+                    ws.add_cell(line, 4, step.step_number)
+                    ws.add_cell(line, 5, step.actions)
+                    ws.add_cell(line, 6, step.expectedresults)
+                    ws.add_cell(line, 7, tc.test_type)
+                end
+            end
+            return line
+        end
+
         def to_hpqc(file)
             suites = extract file
             workbook = RubyXL::Workbook.new
@@ -20,23 +36,20 @@ module Qaxqa
             set_header worksheet
             line = 0
             suites.testsuites.each_with_index do |s|
+                subject_name = s.subject
                 line += 1
-                worksheet.add_cell(line, 0, s.subject)
-                worksheet.add_cell(line, 1, s.test_name)
-                worksheet.add_cell(line, 2, s.details)
-                s.testcases.each_with_index do |tc|
-                    tc.steps.each_with_index do |step|
-                        line +=1
-                        worksheet.add_cell(line, 0, tc.subject)
-                        worksheet.add_cell(line, 1, tc.test_name)
-                        worksheet.add_cell(line, 2, tc.summary)
-                        worksheet.add_cell(line, 3, tc.preconditions)
-                        worksheet.add_cell(line, 4, step.step_number)
-                        worksheet.add_cell(line, 5, step.actions)
-                        worksheet.add_cell(line, 6, step.expectedresults)
-                        worksheet.add_cell(line, 7, tc.test_type)
+                if s.testsuites.size > 0
+                    s.testsuites.each do |ss|
+                        worksheet.add_cell(line, 0, subject_name)
+                        worksheet.add_cell(line, 1, ss.test_name)
+                        worksheet.add_cell(line, 2, ss.details)
+                        line = insert_cases(worksheet, ss.testcases, line) if ss.testcases.size > 0
                     end
                 end
+                worksheet.add_cell(line, 0, subject_name)
+                worksheet.add_cell(line, 1, s.test_name)
+                worksheet.add_cell(line, 2, s.details)
+                line = insert_cases(worksheet, s.testcases, line) if s.testcases.size > 0
             end
             workbook.write("output.xlsx")
         end

data/lib/qaxqa/testsuite.rb

@@ -3,7 +3,35 @@ module Qaxqa
 	# Module class to set XML parsed attributes to a suitecase object
 	class Testsuite
 
-		attr_accessor :subject, :test_name, :details, :testcases
+		attr_accessor :subject, :test_name, :details, :testcases, :testsuites
+
+		def self.has_suite?(node)
+			node.xpath('./testsuite').size > 0
+		end
+
+		# Parse testcases
+		def self.parse_testcases(testsuite)
+			testcases = []
+			testsuite.xpath("./testcase").each do |tc|
+				testcase = Testcase.new
+				testcase.steps = []
+				testcase.subject = suite.subject
+				testcase.test_name = tc.attributes["name"].value
+				testcase.summary = tc.xpath("./summary").text
+				testcase.preconditions = tc.xpath("./preconditions").text
+				testcase.test_type = "Manual"
+				# Parse steps
+				tc.xpath("./steps/*").each do |step_node|
+					step = Step.new
+					step.step_number = step_node.xpath("./step_number").text
+					step.actions = step_node.xpath("./actions").text
+					step.expectedresults = step_node.xpath("./expectedresults").text
+					testcase.steps << step
+				end
+				testcases << testcase
+			end
+			return testcases
+		end
 
 		def self.parse(doc)
 			root = doc.xpath("//testsuite/testsuite")
@@ -16,26 +44,20 @@ module Qaxqa
 					suite.subject = main_subject
 					suite.test_name = node.attributes["name"].value
 					suite.details = node.xpath("./details").text
-					suite.testcases = []
-					# Parse testcases
-					node.children.xpath("./testcase").each do |tc|
-						testcase = Testcase.new
-						testcase.steps = []
-						testcase.subject = suite.subject
-						testcase.test_name = tc.attributes["name"].value
-						testcase.summary = tc.xpath("./summary").text
-						testcase.preconditions = tc.xpath("./preconditions").text
-						testcase.test_type = "Manual"
-						# Parse steps
-						tc.xpath("./steps/*").each do |step_node|
-							step = Step.new
-							step.step_number = step_node.xpath("./step_number").text
-							step.actions = step_node.xpath("./actions").text
-							step.expectedresults = step_node.xpath("./expectedresults").text
-							testcase.steps << step
-						end
+					suite.testcases = self.parse_testcases node
+					suite.testsuites = []
 
-						suite.testcases << testcase
+					if self.has_suite? node
+						subnode = node.xpath("./testsuite")
+						subnode.each do |sn|
+							subsuite = Testsuite.new
+							subsuite.subject = main_subject
+							subsuite.test_name = sn.attributes["name"].value
+							subsuite.details = sn.xpath("./details").text
+							subsuite.testcases = self.parse_testcases sn
+							subsuite.testsuites = []
+							suite.testsuites << subsuite
+						end
 					end
 					suites << suite
 				end

data/lib/qaxqa/version.rb

@@ -1,3 +1,3 @@
 module Qaxqa
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/qaxqa.gemspec

@@ -36,9 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rubyXL"
   
   # Development
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qaxqa
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ronaldo Possan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,48 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement