itriagetestrail 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf91591aef40e30e0e07cbdd4d67d92672052a48
-  data.tar.gz: 9b06e2ad6ff898a76e7698aaa5534e71d859e56d
+  metadata.gz: a6637c3cbe5789b8c5a8227f0bc5ce59d96db2bb
+  data.tar.gz: 70aff355789a94a59f90c4838a95f7cc9daa3b44
 SHA512:
-  metadata.gz: 8066804b33b5bdb0f06e7aebcf8eb2c8341084b5202eda9ce0e064de6d229932defac95b4a960158681dfb12663b435f7e8f6a6f0c6761099abe427bdaf8a5a7
-  data.tar.gz: 73f687aa9bd611fc4c82f9b87c58ce7a9fe30530e5ccd39898a9a386098e53fe9033894bb9b4b57474c225e8db472d5122dd81b54a994fb339a9d20332dfaa25
+  metadata.gz: 551fcee66d22ff86fca5209be43ccfb118c08702c5e57f293b5f54cf38c8f3d53a18a73a2d2fe48c91e8926958a4a1ec716b7fc1d7fd5b4a325d671a39a52bd9
+  data.tar.gz: 1b8737fee7539ba3671bea83d565faaaf0916d2fb33e01a76fe2227010d71016651a01a3e7ae50e4acf0ac9b5c51bb440642b7cee88f31116206d644f11a8410

data/lib/itriagetestrail/version.rb

@@ -1,3 +1,3 @@
 module Itriagetestrail
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end

data/lib/itriagetestrail.rb

@@ -310,6 +310,95 @@ module Itriagetestrail
     end
   end
 
+  module TestPlans
+
+    def configuration_group(name)
+      res = {}
+      @configurations.each do |config|
+        res = config if config['name'] == name
+      end
+      res
+    end
+
+    def config_id(name, value)
+      res = {}
+      configuration = configuration_group(name)
+
+      return nil if configuration.empty?
+      configuration['configs'].each do |config|
+        res = config['id'] if config['name'] == value
+      end
+      res
+    end
+
+
+    def configurations
+      @configurations = @client.send_get("get_configs/#{@project_id}")
+    end
+
+    def configuration_ids
+
+      @configuration_ids = []
+
+      # evaluate @testrail_comfig
+      @configuration_ids << config_id('Browser', @testrail_config[:config][:browser])
+      @configuration_ids << config_id('Browser Version', @testrail_config[:config][:browserVersion])
+      @configuration_ids << config_id('Platform', @testrail_config[:config][:platform])
+      @configuration_ids << config_id('Android Version', @testrail_config[:config][:android])
+      @configuration_ids << config_id('Android Device', @testrail_config[:config][:androidDevice])
+      @configuration_ids << config_id('IOS Version', @testrail_config[:config][:ios])
+
+      # remove the nils
+      @configuration_ids.compact!
+
+      @configuration_ids
+    end
+
+    def add_testrail_plan
+
+      body = {
+          name: test_name,
+          description: '',
+          milestone_id: @milestone_id
+      }
+
+      @plan = @client.send_post("add_plan/#{@project_id}", body)
+      # todo: replace debugging
+      puts @plan.inspect
+
+      @plan_id = @plan['id']
+      # todo: replace debugging
+      puts @plan_id.inspect
+    end
+
+    def add_plan_entry
+
+      # todo: refactor redundant assignments of @suite_id
+      @suite_id = testrail_suite_id(@suite_name)
+      body = {
+          suite_id: @suite_id,
+          # todo: replace hardcoded name
+          name: 'replace this with config description',
+          include_all: true,
+          # todo: replace hardcoded config
+          config_ids: configuration_ids,
+          runs: [
+              {
+                  include_all: true,
+                  config_ids: configuration_ids
+              }
+          ]
+      }
+
+      @plan_entry = @client.send_post("add_plan_entry/#{@plan_id}", body)
+      # todo: replace debugging
+      puts @plan_entry.inspect
+      @run_id = @plan_entry['runs'][0]['id']
+      # todo: replace debugging
+      puts @run_id.inspect
+    end
+  end
+
   module TestRuns
     def extend_testrail_run
       # Reset test scope to include all cases
@@ -417,6 +506,7 @@ module Itriagetestrail
     include Milestones
     include Sections
     include TestCases
+    include TestPlans
     include TestRuns
     include TestResults
 
@@ -435,11 +525,13 @@ module Itriagetestrail
       @setup = false
       config
 
-      if File.exist?(tempfile_name)
-        @run_id = File.read(tempfile_name)
+      if File.exist?(run_tempfile_name)
+        @run_id = File.read(run_tempfile_name)
+        @plan_id = File.read(plan_tempfile_name)
         @shared_run = true
       else
         @run_id = 0
+        @plan_id = 0
       end
 
       @milestone_name = normalize_milestone
@@ -483,13 +575,21 @@ module Itriagetestrail
         password: ENV['TESTRAIL_PASSWORD'],
         tzinfoTimeZone: time_zone,
         projectId: ENV['TESTRAIL_PROJECT_ID'],
+        masterMilestone: ENV['TESTRAIL_MASTER_MILESTONE'],
         projectName: ENV['APP_NAME'],
         suiteName: ENV['TESTRAIL_SUITE_NAME'],
         run_id: ENV['TESTRAIL_RUN_ID'],
         close_run: ENV['TESTRAIL_CLOSE_RUN'],
         origin: ENV['GIT_BRANCH'],
         jenkinsBuild: ENV['BUILD_NUMBER'],
-        appVersion: nil
+        appVersion: nil,
+        config: { ios: ENV['IOS_VERSION'],
+                  android: ENV['ANDROID_VERSION'],
+                  androidDevice: ENV['DEVICE_NAME'],
+                  browser: ENV['BROWSER_NAME'], # Jenkins: SELENIUM_BROWSER
+                  platform: ENV['PLATFORM'], # Jenkins: SELENIUM_PLATFORM
+                  browserVersion: ENV['BROWSER_VERSION'] # Jenkins: SELENIUM_VERSION
+        }
       }
     end
 
@@ -531,10 +631,16 @@ module Itriagetestrail
 
       reset_milestone(@milestone_name)
 
-      if @run_id == 0
-        add_testrail_run
+      if configuration_ids.size > 0
+        add_testrail_plan if @plan_id == 0
+        add_plan_entry
       else
-        extend_testrail_run
+        if @run_id == 0
+          add_testrail_run
+        else
+          # this else may be obsolete
+          extend_testrail_run
+        end
       end
 
       @pool = Pool.new(1)
@@ -552,10 +658,16 @@ module Itriagetestrail
       testrail_sections
       # Get the test rail ids
       testrail_ids
+      # Populate configurations
+      configurations
+    end
+
+    def run_tempfile_name
+      "./tmp/#{@testrail_config[:jenkinsBuild]}_testrail_run_id"
     end
 
-    def tempfile_name
-      "./tmp/#{@testrail_config[:jenkinsBuild]}_testrail_id"
+    def plan_tempfile_name
+      "./tmp/#{@testrail_config[:jenkinsBuild]}_testrail_plan_id"
     end
 
     def make_connection
@@ -577,13 +689,15 @@ module Itriagetestrail
 
     # This method is only used publicly
     def delete_temp_files
-      File.delete(tempfile_name) if File.exist?(tempfile_name)
+      File.delete(run_tempfile_name) if File.exist?(run_tempfile_name)
+      File.delete(plan_tempfile_name) if File.exist?(plan_tempfile_name)
     end
 
     # This method is only used publicly
     def initialize_temp_files
       Dir.mkdir('./tmp') unless File.exists?('./tmp')
-      File.write(tempfile_name, @run_id.to_s)
+      File.write(run_tempfile_name, @run_id.to_s)
+      File.write(plan_tempfile_name, @plan_id.to_s)
 
       @shared_run = true
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itriagetestrail
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - a801069
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler