itriagetestrail 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94e0853e28a8acdafc49675a90cfc199d16a83b0
-  data.tar.gz: 8d4ffb6c089f4e60883821f9c1c698a29d8325dc
+  metadata.gz: e6f6904a905838df066482dcc05ebb144f9a160a
+  data.tar.gz: 799591fb203c9a7b63bad700b43aa8fc1b119715
 SHA512:
-  metadata.gz: eb789fe6e8d813e57b85d96d48a9145e9cc48835aab41c716fb12621ed4ca859ea94b67d3380c531e32aae652d237c02ec784ea9f50b65d0b1e8b6db695d82f5
-  data.tar.gz: 90b9a79fbad30ab04570e273f6dcf30096f14bd4b5d704bdcd78e512af5b6cf3e7f57a6b2541cdd188a359ca968a9c28f3360a7fc46b1617e2c9d552b0a56bce
+  metadata.gz: 0b183e17372937c91a2ce1ea4ee1f53356daf0b2f2dc7f810309d0a27ef8903e320b5a6f9cd7386f3394750f01d1c2d651580cf6d6317728af58258631e78a54
+  data.tar.gz: da677a2b7f989092ff762cd5c00c66368600771bb2592e53a7e2c7443ec5a771b858fb9a7182b9eab9ea3bb40938ddd238ddc9f1a7633c3a59db0b6dce3bf2f9

data/lib/itriagetestrail/version.rb

@@ -1,3 +1,3 @@
 module Itriagetestrail
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/lib/itriagetestrail.rb

@@ -30,6 +30,7 @@ module Itriagetestrail
       @milestone_name = normalize_milestone
       @jenkins_build = @testrail_config[:jenkinsBuild]
       @app_version = @testrail_config[:appVersion]
+      @suite_name = @testrail_config[:suiteName]
 
       if @testrail_config[:tzinfoTimeZone].nil? || @testrail_config[:tzinfoTimeZone].empty?
         @time_zone = TZInfo::Timezone.get('UTC')
@@ -83,7 +84,9 @@ module Itriagetestrail
     def initialize_variables
       make_connection
       # Set the project id
-      set_project_id
+      set_project
+      # Get the test rail suites
+      testrail_suites
       # Get the test rail sections
       testrail_sections
       # Get the test rail ids
@@ -96,9 +99,81 @@ module Itriagetestrail
       @client.password = @testrail_config[:password]
     end
 
+    def projects
+      @projects ||= @client.send_get("get_projects")
+    end
+
+    def project_by_name(name)
+      res = -1
+      projects.each do |project|
+        res = project if project['name'] == name
+      end
+      res
+    end
+
+    def project_by_id(id)
+      res = -1
+      projects.each do |project|
+        res = project if project['id'] == id.to_i
+      end
+      res
+    end
+
+    def set_project
+      requested_id = @testrail_config[:projectId]
+      case requested_id
+        when nil, ''
+          # a project id was not provided, fetch it from TestRail by project name
+          res = project_by_name(@testrail_config[:projectName])
+          if res == -1
+            @execute = false
+            return
+          end
+          @project_id = res['id']
+          @suite_mode = res['suite_mode']
+        else
+          # use the requested project id
+          @project_id = requested_id
+          @suite_mode = project_by_id(@project_id)['suite_mode']
+      end
+    end
+
+    # TestRail Suites
+    def testrail_suites
+      case @suite_mode
+      when 2,3
+        @suites = @client.send_get("get_suites/#{@project_id}")
+      end
+    end
+
+    def testrail_suite_id(suite_name)
+      res = -1
+      @suites.each do |suite|
+        res = suite['id'] if suite['name'] == suite_name
+      end
+      res
+    end
+
+    def add_testrail_suite(suite_name)
+      body = { name: suite_name }
+      res = @client.send_post("add_suite/#{@project_id}", body)
+      testrail_suite = res['id']
+
+      #re-establish suites
+      testrail_suites
+
+      testrail_suite
+    end
+
     # TestRail Sections
     def testrail_sections
-      @sections = @client.send_get("get_sections/#{@project_id}")
+      case @suite_mode
+      when 2,3
+        @suite_id = testrail_suite_id(@suite_name)
+        @sections = @client.send_get("get_sections/#{@project_id}&suite_id=#{@suite_id}")
+      else
+        @sections = @client.send_get("get_sections/#{@project_id}")
+      end
     end
 
     def testrail_section_id(section_title)
@@ -109,6 +184,29 @@ module Itriagetestrail
       res
     end
 
+    def add_testrail_section(section_title)
+      if @suite_name
+        body = {
+            name: section_title,
+            suite_id: testrail_suite_id(@suite_name)
+        }
+      else
+        body = {
+            name: section_title
+        }
+      end
+
+      res = @client.send_post("add_section/#{@project_id}", body)
+
+      testrail_section = res['id']
+
+      # re-establish sections
+      testrail_sections
+
+      testrail_section
+    end
+
+    #TestRail Milestones
     def normalize_milestone
       case @testrail_config[:origin]
         when 'prd', 'production', 'origin/production'
@@ -130,27 +228,6 @@ module Itriagetestrail
       end
     end
 
-    def set_project_id()
-      requested_id = @testrail_config[:projectId]
-      case requested_id
-      when nil, ''
-        # a project id was not provided, fetch it from TestRail by project name
-        projects = @client.send_get("get_projects")
-        res = -1
-        projects.each do |project|
-          res = project['id'] if project['name'] == @testrail_config[:projectName]
-        end
-        if res == -1
-          @execute = false
-          return
-        end
-        @project_id = res
-      else
-        # use the requested project id
-        @project_id = requested_id
-      end
-    end
-
     # returns timestamp for begining of first day of current quarter
     def milestone_period_start
       time_zone = TZInfo::Timezone.get('America/Denver')
@@ -247,24 +324,14 @@ module Itriagetestrail
       end
     end
 
-    def add_testrail_section(section_title)
-      body = {
-        name: section_title
-      }
-
-      res = @client.send_post("add_section/#{@project_id}", body)
-
-      testrail_section = res['id']
-
-      # re-establish sections
-      testrail_sections
-
-      testrail_section
-    end
-
     # TestRail Cases
     def testrail_ids
-      @test_cases = @client.send_get("get_cases/#{@project_id}&type_id=3")
+      case @suite_mode
+      when 2,3
+        @test_cases = @client.send_get("get_cases/#{@project_id}&suite_id=#{@suite_id}&type_id=3")
+      else
+        @test_cases = @client.send_get("get_cases/#{@project_id}&type_id=3")
+      end
 
       @test_case_ids = []
 
@@ -331,27 +398,23 @@ module Itriagetestrail
 
     # open a test run to submit test results
     def add_testrail_run
-      if @testrail_config[:include_all] || true
-
-        body = {
+      body = {
           name: test_name,
           description: '',
           include_all: true,
           milestone_id: @milestone_id
-        }
-      else
+      }
 
-        body = {
-          name: test_name,
-          description: '',
-          include_all: false,
-          case_ids: @test_case_ids,
-          milestone_id: @milestone_id
-        }
+      unless @testrail_config[:include_all] || true
+        body[:include_all] = false
+        body[:case_ids] = @test_case_ids
       end
 
+      case @suite_mode
+      when 2,3
+        body[:suite_id] = @suite_id
+      end
       res = @client.send_post("add_run/#{@project_id}", body)
-
       @run_id = res['id']
     end
 

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: itriagetestrail
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - a801069
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 description: Plugin to export your cucumber tests in the Testrail
@@ -59,8 +59,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/itriagetestrail.rb
-- lib/itriagetestrail/testrail_binding.rb
 - lib/itriagetestrail/pool.rb
+- lib/itriagetestrail/testrail_binding.rb
 - lib/itriagetestrail/version.rb
 homepage: 
 licenses: []
@@ -71,17 +71,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Plugin to export your cucumber tests in the Testrail