itriagetestrail 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f790a108a246bd32d40671679a904a1e41c8fc0f
-  data.tar.gz: 67559f3e5e0d1b8672de8bafc54777c497a405a9
+  metadata.gz: 0e4b34fc68615740cb5247064b7635c603149c7e
+  data.tar.gz: 08b07991a0d6917d176e1fe72f209e3f2527ff18
 SHA512:
-  metadata.gz: 5969ef31999a2dfa57f143fb6b87a67aede417aef781fd9d1672e017b5df1ef0e74e52d292307b4261bed8307c70d8b351ab7ae355059e28fff4f2807b4a9b9a
-  data.tar.gz: 7d9943e4b9574798686842f08c566abe84b13ec9445c4e6d91a6556bc3a49bf57f595102a24ba993b8d395c2aa03ea3db499b889ffd068608c3117b3231e3e5a
+  metadata.gz: 0ef107f0a6f489c7d4bab0f85ccc176d124316ab9dce714a6667b81990a890e63b97fe3e6ac8d66cb591d1b61179dac96da9db8b4ee30aa3aa23e245b2c94e55
+  data.tar.gz: 443c46a032847a4779671bd61e82696d28b130b92cc536f4d66b793f5ab4548f4752a6938005504b548c675106fc9000df0bc69e8cd90383901151083aae48a6

data/lib/itriagetestrail/pool.rb

@@ -1,9 +1,7 @@
 require 'thread'
 
 class Pool
-
   def initialize(size)
-
     @size = size
     @jobs = Queue.new
 

data/lib/itriagetestrail/testrail_binding.rb

@@ -24,9 +24,8 @@ module TestRail
     attr_accessor :password
 
     def initialize(base_url)
-      if !base_url.match(/\/$/)
-        base_url += '/'
-      end
+      valid_regex = %r{/\/$/}
+      base_url += '/' unless valid_regex.match(base_url)
       @url = base_url + 'index.php?/api/v2/'
     end
 
@@ -63,6 +62,7 @@ module TestRail
     end
 
     private
+
     def make_connection(url)
       conn = Net::HTTP.new(url.host, url.port)
       if url.scheme == 'https'
@@ -105,7 +105,7 @@ module TestRail
           error = 'No additional error message received'
         end
 
-        raise APIError, "TestRail API returned HTTP #{response.code} #{error}"
+        fail APIError, "TestRail API returned HTTP #{response.code} #{error}"
       end
       result
     end

data/lib/itriagetestrail/version.rb

@@ -1,3 +1,3 @@
 module Itriagetestrail
-  VERSION = "0.0.3"
+  VERSION = '0.0.4'
 end

data/lib/itriagetestrail.rb

@@ -1,29 +1,34 @@
-require "itriagetestrail/version"
-require_relative "itriagetestrail/testrail_binding"
-require_relative "itriagetestrail/pool"
-#require 'testrail-rails'
-
+require 'itriagetestrail/version'
+require_relative 'itriagetestrail/testrail_binding'
+require_relative 'itriagetestrail/pool'
 
 module Itriagetestrail
   class TestRailInterface
-    # code goes here...
     attr_accessor :client
     attr_accessor :sections
     attr_accessor :test_cases
     attr_accessor :test_case_ids
     attr_accessor :run_id
     attr_accessor :execute
-    attr_reader :results
-    attr_reader :external_results
     attr_accessor :pool
     attr_accessor :batch_size
+    attr_reader :results
+    attr_reader :external_results
 
-    def initialize(execute, testrail_config)
+    def initialize(testrail_config, origin)
       @run_id = 0
       @setup = false
       @testrail_config = testrail_config
       @project_id = @testrail_config['project_id']
-      @execute = execute
+      @milestone_name = normalize_milestone(origin)
+
+      if @testrail_config['send_local_results?'] && @milestone_name == 'Local'
+        @execute = true
+      elsif @milestone_name == 'Local'
+        @execute = false
+      else
+        @execute = true
+      end
     end
 
     def setup?
@@ -47,6 +52,8 @@ module Itriagetestrail
       # Get the test rail ids
       testrail_ids
 
+      @milestone_id = fetch_milestone(@milestone_name)
+
       add_testrail_run
 
       @pool = Pool.new(1)
@@ -67,25 +74,52 @@ module Itriagetestrail
 
     def testrail_section_id(section_title)
       res = -1
-      @sections.each { | section |
+      @sections.each do |section|
+        res = section['id'] if section['name'] == section_title
+      end
+      res
+    end
 
-        if section['name'] == section_title
-          res = section['id']
-        end
-      }
+    def normalize_milestone(origin)
+      case origin
+        when 'local', ''
+          'Local'
+        when 'master'
+          'Master'
+        else
+          'Dev Branch'
+      end
+    end
+
+    def fetch_milestone(requested_milestone_name)
+      milestones = @client.send_get("get_milestones/#{@project_id}")
+      res = -1
+      milestones.each do |milestone|
+        res = milestone['id'] if milestone['name'] == requested_milestone_name
+      end
+
+      if res == -1
+        # We need to add the milestone to TestRail
+
+        body = {
+            name: requested_milestone_name
+        }
+
+        res = @client.send_post("add_milestone/#{@project_id}", body)['id']
+      end
       res
     end
 
     def add_testrail_section(section_title)
       body = {
-          :name => section_title
+          name: section_title
       }
 
       res = @client.send_post("add_section/#{@project_id}", body)
 
       testrail_section = res['id']
 
-      #re-establish sections
+      # re-establish sections
       testrail_sections
 
       testrail_section
@@ -93,68 +127,65 @@ module Itriagetestrail
 
     # TestRail Cases
     def testrail_ids
-
       @test_cases = @client.send_get("get_cases/#{@project_id}&type_id=3")
 
       @test_case_ids = []
 
-      @test_cases.each { |test_case| @test_case_ids <<  test_case['id']}
+      @test_cases.each { |test_case| @test_case_ids << test_case['id'] }
     end
 
     def testrail_test_case_id(external_id)
-
       res = -1
-      @test_cases.each { | test_case |
-
+      @test_cases.each do |test_case|
         if test_case['custom_external_case_id'] == external_id
           res = test_case['id']
         end
-      }
+      end
       res
     end
 
     def associate_result(external_id)
-
       test_case_id = testrail_test_case_id(external_id)
-      #store the test case id with the local result
-      @results[:results].each { |result|
-
-        if result['external_id'] == external_id
-          @external_results['results'] << {case_id: test_case_id, status_id: result['status_id'], comment: result['comment']}
-        end
-      }
+      # store the test case id with the local result
+      @results[:results].each do |result|
+        next unless result['external_id'] == external_id
+        @external_results['results'] << { case_id: test_case_id,
+                                          status_id: result['status_id'],
+                                          comment: result['comment'] }
+      end
     end
 
     # add the test case if it doesn't exist
     def add_testrail_test_case(scenario_title, external_id, scenario_steps, section_id)
       body = {
-          :title => scenario_title,
-          :custom_external_case_id => external_id,
-          :custom_steps => scenario_steps,
-          :type_id => 3
+          title: scenario_title,
+          custom_external_case_id: external_id,
+          custom_steps: scenario_steps,
+          type_id: 3
       }
 
       @client.send_post("add_case/#{section_id}", body)
 
-      #refresh test case ids
+      # refresh test case ids
       testrail_ids
     end
 
     # open a test run to submit test results
     def add_testrail_run
-
-      if @testrail_config['include_all?'] then
+      if @testrail_config['include_all?']
 
         body = {
-            :name => "POC Regression on #{Time.now}",
-            :include_all => true
+            name: "POC Regression on #{Time.zone.now}",
+            include_all: true,
+            milestone_id: @milestone_id
         }
       else
 
         body = {
-            :name => "POC Regression on #{Time.now}",
-            :include_all => false,
-            :case_ids => @test_case_ids
+            name: "POC Regression on #{Time.zone.now}",
+            include_all: false,
+            case_ids: @test_case_ids,
+            milestone_id: @milestone_id
         }
       end
 
@@ -164,79 +195,59 @@ module Itriagetestrail
     end
 
     def send_results_to_testrail
-      if @results[:results].size != 0
-
-        # copy what is in the results
-        @submitted[:results] << @results[:results]
-
-        send = {:results => @results[:results]}
-        # Commenting out the multi-threading stuff
-        # @pool.schedule do
-          #make sure tests are part of current run
-          begin
-           res = @client.send_post("add_results_for_cases/#{@run_id}", send)
-           puts res
-          rescue Exception => e
-            raise e
-            end
-        # end
-
-        # @results[:results] = @results[:results] - send[:results]
+      return unless @results[:results].size == 0
+      # copy what is in the results
+      @submitted[:results] << @results[:results]
+
+      begin
+        send = { results: @results[:results] }
+        res = @client.send_post("add_results_for_cases/#{@run_id}", send)
+        puts res
+      rescue StandardError => e
+        raise e
       end
     end
 
     def update_test_suite(scenario_title, external_id, scenario_steps)
-
-      # establish variables
-      #@external_id = result['external_id']
-
       feature = external_id.split(';')[0]
 
       section_id = testrail_section_id(feature)
 
-      #if the testrail section does not exist, update sections
-      if section_id == -1
+      # if the testrail section does not exist, update sections
+      section_id = add_testrail_section(feature) if section_id == -1
 
-        section_id = add_testrail_section(feature)
-      end
-
-      #if the testrail case does not exist, update cases
+      # if the testrail case does not exist, update cases
       if testrail_test_case_id(external_id) == -1
 
-        #@scenario_title = result['scenario_title']
+        # @scenario_title = result['scenario_title']
 
         add_testrail_test_case(scenario_title, external_id, scenario_steps, section_id)
         sleep 1
       end
 
-      #store the case id associated with the external_id
+      # store the case id associated with the external_id
       associate_result(external_id)
     end
 
-
     def store_result(scenario_title, external_id, scenario_steps, status_id, comment)
-
       update_test_suite scenario_title, external_id, scenario_steps
 
       case_id = testrail_test_case_id(external_id)
 
-      @results[:results] << {case_id: case_id, scenario_title: scenario_title, external_id: external_id, scenario_steps: scenario_steps, status_id: status_id, comment: comment }
-
-      # Removes multi-threading
-      # if @results[:results].size >= @batch_size
-      #
-      #   send_results_to_testrail
-      #
-      # end
+      @results[:results] << {
+          case_id: case_id,
+          scenario_title: scenario_title,
+          external_id: external_id,
+          scenario_steps: scenario_steps,
+          status_id: status_id,
+          comment: comment
+      }
     end
 
     def shutdown
       @pool.shutdown
 
-      if @testrail_config['close_run?']
-        @client.send_post("close_run/#{@run_id}", {})
-      end
+      @client.send_post("close_run/#{@run_id}", {}) if @testrail_config['close_run?']
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itriagetestrail
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - a801069
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler