test_rail_integration 0.0.6 → 0.0.6.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 910fdd63a0e45fbafbddd98fea19a3ebec32543d
-  data.tar.gz: 3438e330c2d6c5612d9b56f3bef19de45937f0e9
+  metadata.gz: f6263824e8e5d1a43a778b36cf67bbe5393bf3b5
+  data.tar.gz: 284c7b5c758ab95097f3576954a3fbbe3fad3299
 SHA512:
-  metadata.gz: 3cae975dc750c4b10e3d7cccb7cefdbd0cffe9ce6b628c30d08bdebb7dd1a79811cf6e199a5cef0cf3c7e53c1e8644ad6f50aff22f6eea6a0f8c3a6fccee1c78
-  data.tar.gz: da1b519ac247e8226e48704e8cf98fa8edbf84cd8132855c215f60c973f3600118162a2bab6d203a92c422f9518b50ae02d57b0c80536206a3cbeba7405c6d31
+  metadata.gz: 8c51851ddf570b76059a2a5f477f5b6a4c4bbd2dc03608208fa3a53024982566aeb87efb2fda7605fc21d76019c8dff3f064bad9c72d4d6141acdb6f26ae0a80
+  data.tar.gz: 8a44411678195ea38890869efd3c9698988d60cd9133fd31560728c1ca4c0b1a45d9b90c12274f2dce0eea1d482acc162918e39dd0f528f75f165ccafdf8d780

data/lib/test_rail_integration/generator/API_client.rb

@@ -14,8 +14,8 @@ require 'json'
 
 module TestRail
   class APIClient
-    @url      = ''
-    @user     = ''
+    @url = ''
+    @user = ''
     @password = ''
 
     attr_accessor :user
@@ -26,8 +26,8 @@ module TestRail
       unless base_url.match(/\/$/)
         base_url += '/'
       end
-      @url      = base_url + 'index.php?/api/v2/'
-      @user     = connection_data[:username]
+      @url = base_url + 'index.php?/api/v2/'
+      @user = connection_data[:username]
       @password = connection_data[:password]
     end
 
@@ -67,7 +67,7 @@ module TestRail
     def _send_request(method, uri, data)
       url = URI.parse(@url + uri)
       if method == 'POST'
-        request      = Net::HTTP::Post.new(url.path + '?' + url.query)
+        request = Net::HTTP::Post.new(url.path + '?' + url.query)
         request.body = JSON.dump(data)
       else
         request = Net::HTTP::Get.new(url.path + '?' + url.query)
@@ -77,7 +77,7 @@ module TestRail
 
       conn = Net::HTTP.new(url.host, url.port)
       if url.scheme == 'https'
-        conn.use_ssl     = true
+        conn.use_ssl = true
         conn.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
       response = conn.request(request)

data/lib/test_rail_integration/generator/connection.rb

@@ -5,13 +5,14 @@ require_relative 'test_case_result'
 module TestRail
   class Connection
 
-    ASSIGNED_TO     ||= TestRailDataLoad.test_rail_data[:assigned_to]
-    TEST_SUITE      ||= TestRailDataLoad.test_rail_data[:test_suite]
+    ASSIGNED_TO ||= TestRailDataLoad.test_rail_data[:assigned_to]
+    TEST_SUITE ||= TestRailDataLoad.test_rail_data[:test_suite]
     CONNECTION_DATA ||= TestRailDataLoad.test_rail_data[:connection_data]
-    PROJECT_ID      ||= TestRailDataLoad.test_rail_data[:project]
-    TEST_RUN_ID     ||= TestRailDataLoad.test_rail_data[:test_run_id]
-    IN_PROGRESS     ||= TestRailDataLoad.test_rail_data[:in_progress]
-    NO_TEST_RAIL    ||= 0
+    PROJECT_ID ||= TestRailDataLoad.test_rail_data[:project]
+    TEST_RUN_ID ||= TestRailDataLoad.test_rail_data[:test_run_id]
+    IN_PROGRESS ||= TestRailDataLoad.test_rail_data[:in_progress]
+    TYPES ||= TestRailDataLoad.test_rail_data[:types]
+    NO_TEST_RAIL ||= 0
 
     #
     # Creates connection to TestRail server
@@ -41,17 +42,51 @@ module TestRail
       client.send_get("get_results_for_case/#{test_run_id}/#{case_id}")
     end
 
+    #
+    # Create test run in test rail for project with name
+    #
+    def self.create_test_run_with_name(name)
+      client.send_post("add_run/#{project_id}", {suite_id: test_suite_id, name: name, include_all: false, case_ids: cases_with_types})
+    end
+
     #
     # Parse results and returns Failed if this test was marked as failed.
     #
     def self.get_previous_test_result(case_id)
       test_results = get_test_result(case_id).map { |status_hash| status_hash["status_id"] }
-      status       = TestCaseResult::FAILED if test_results.include?(TestCaseResult::FAILED)
-      status       ||= TestCaseResult::PASS if test_results.first == TestCaseResult::PASS
-      status       ||= TestCaseResult::NEW
+      status = TestCaseResult::FAILED if test_results.include?(TestCaseResult::FAILED)
+      status ||= TestCaseResult::PASS if test_results.first == TestCaseResult::PASS
+      status ||= TestCaseResult::NEW
       status
     end
 
+    #
+    # Parse results and returns previous comment.
+    #
+    def self.get_previous_comments(case_id)
+      test_comment = get_test_result(case_id).map { |hash| hash["comment"] }
+      comment = test_comment
+      comment ||= []
+      comment
+    end
+
+    #
+    # Get indexes of failed results
+    #
+    def self.get_indexes_of_fails(test_case_id)
+      indexes = get_test_result(test_case_id).map.with_index { |result, index| result["status_id"] == TestCaseResult::COMMENT[:fail][:status] ? index : nil }
+      indexes.compact
+    end
+
+    #
+    # Get last failed comment for test case
+    #
+    def self.get_last_failed_comment(test_case_id)
+      comments = get_previous_comments(test_case_id)
+      index = Connection.get_indexes_of_fails(test_case_id).first
+      comments[index]
+    end
+
     #
     # Get ID of all test cases from current test run
     #
@@ -70,24 +105,49 @@ module TestRail
     end
 
     #
-    # Getting test run id value
+    # Setting test run id value
     #
     def self.test_run_id
       @test_run_id ||= TEST_RUN_ID
     end
 
+    #
+    # Setting project id
+    #
+    def self.project_id
+      @project_id ||= PROJECT_ID
+    end
+
+
+    #
+    # Setting test suite id
+    #
+    def self.test_suite_id
+      @test_suite_id ||= TEST_SUITE
+    end
+
     #
     # Getting information about test run
     #
-    def self.test_run_data
-      client.send_get("get_run/#{test_run_id}")
+    def self.test_run_data(id_of_run=test_run_id)
+      client.send_get("get_run/#{id_of_run}")
     end
 
     #
     # Get test run name
     #
-    def self.test_run_name
-      test_run_data["name"]
+    def self.test_run_name(id_of_run=test_run_id)
+      test_run_data(id_of_run)["name"]
+    end
+
+    #
+    # Take all test types
+    #
+    def self.cases_with_types
+      types = TYPES
+      cases = client.send_get("get_cases/#{project_id}&suite_id=#{test_suite_id}&type_id=#{types}")
+      case_ids = cases.map { |test_case| test_case["id"] }
+      case_ids
     end
 
     #
@@ -95,9 +155,32 @@ module TestRail
     #
     # VN LIVE_TEST in progress => VN LIVE_TEST
     #
-    def self.change_test_run_name
+    def self.change_test_run_name(run_id = test_run_id)
       new_name = test_run_name.gsub(IN_PROGRESS, "")
-      client.send_post("update_run/#{test_run_id}", { name: new_name })
+      client.send_post("update_run/#{run_id}", {name: new_name})
     end
+
+    #
+    # Send request for creation test run with name
+    # ("add_run/3", {suite_id: 3, name "New test run", include_all: false, case_ids: C31, C32, C33}
+    #
+    def self.create_new_test_run_with_name
+      client.send_post("add_run/#{project_id}", {suite_id: test_suite_id, name: generate_test_run_name, include_all: false, case_ids: cases_with_types})
+    end
+
+    #
+    # Get all test runs for project
+    #
+    def self.get_test_runs
+      client.send_get("get_runs/#{project_id}")
+    end
+
+    #
+    # Generate name for test run with date
+    #
+    def self.generate_test_run_name
+      "Automation testrun #{Time.now.strftime("%d/%m/%Y")}"
+    end
+
   end
 end

data/lib/test_rail_integration/generator/project/run_test_run.rb

@@ -4,6 +4,7 @@ require 'test_rail_integration'
 require 'thor'
 require 'test_rail_integration/generator/API_client'
 require 'test_rail_integration/generator/connection'
+require 'test_rail_integration/generator/test_run_creation'
 require 'test_rail_integration/generator/test_rail_tools'
 
 module TestRail
@@ -11,7 +12,17 @@ module TestRail
     TestRailIntegration::TestTail::Generators::Project.copy_file("test_rail_data.yml")
     raise "Please fill all required data in test rail data yml file"
   end
-  id_of_run = ARGV.shift
-  TestRailTools.prepare_config(id_of_run)
+
+  parameters = ARGV
+  #TODO Make Hash instead of array for parameters
+  if parameters[0] == 'auto'
+    environment_for_run = parameters[1], parameters[2]
+    id_of_run = TestRunCreation.initialize_test_run
+  else
+    id_of_run = parameters[0].to_i
+    name_of_environment = Connection.test_run_name(id_of_run).downcase.match(/(#{TestRunParameters::VENTURE_REGEX}) (#{TestRunParameters::ENVIRONMENT_REGEX})*/)
+    environment_for_run = name_of_environment[1], name_of_environment[2] if name_of_environment
+  end
+  TestRailTools.prepare_config(id_of_run, environment_for_run)
 end
 

data/lib/test_rail_integration/generator/project/test_rail_data.yml

@@ -14,8 +14,8 @@
 :test_failed: 5
 :new_test: 0
 
-:test_passed_comment: "**passed:**"
-:test_failed_comment: "**failed:**"
+:test_passed_comment: "test **passed:**"
+:test_failed_comment: "test **failed:**"
 
 :ventures: vn|id|ph|my|sg|th #values for generating parametrized url for running test
 :environments: live_test|staging|showroom #values for generating parametrized url for running test
@@ -23,3 +23,8 @@
 :in_progress: " (in progress)" #value for changing test run name for monitoring complete of test run
 
 :test_run_id: 0 #parametrized test run from "ruby run_test_run.rb <test run number>"
+
+:exec_command: "cucumber -p lazada.#{parameters.venture}.#{parameters.environment} TESTRAIL=1 --color -f json -o cucumber.json -t  "
+
+:types: #types for filtering from Test Rail
+

data/lib/test_rail_integration/generator/test_case_result.rb

@@ -3,23 +3,26 @@ require_relative 'test_rail_data_load'
 module TestRail
   class TestCaseResult
 
-    attr_accessor :test_case_id, :title, :comment, :exception_message
+    attr_accessor :test_case_id, :title, :comment, :exception_message, :assign_to, :previous_comment
 
     COMMENT_STATUS ||= TestRail::TestRailDataLoad.test_rail_data[:status_comment]
-    PASS           ||= TestRail::TestRailDataLoad.test_rail_data[:test_pass]
-    FAILED         ||= TestRail::TestRailDataLoad.test_rail_data[:test_failed]
-    NEW            ||= TestRail::TestRailDataLoad.test_rail_data[:new_test]
-    PASS_COMMENT   ||= TestRail::TestRailDataLoad.test_rail_data[:test_passed_comment]
+    PASS ||= TestRail::TestRailDataLoad.test_rail_data[:test_pass]
+    FAILED ||= TestRail::TestRailDataLoad.test_rail_data[:test_failed]
+    NEW ||= TestRail::TestRailDataLoad.test_rail_data[:new_test]
+    PASS_COMMENT ||= TestRail::TestRailDataLoad.test_rail_data[:test_passed_comment]
     FAILED_COMMENT ||= TestRail::TestRailDataLoad.test_rail_data[:test_failed_comment]
+    ASSIGN_TO ||= TestRail::TestRailDataLoad.test_rail_data[:assign_to]
 
-    COMMENT ||= { :pass           => { status: PASS, comment: PASS_COMMENT },
-                  :fail           => { status: FAILED, comment: FAILED_COMMENT },
-                  :unchanged_pass => { status: COMMENT_STATUS, comment: PASS_COMMENT }
+
+    COMMENT ||= {:pass => {status: PASS, comment: PASS_COMMENT},
+                 :fail => {status: FAILED, comment: FAILED_COMMENT},
+                 :unchanged_pass => {status: COMMENT_STATUS, comment: PASS_COMMENT}
     }
 
     def initialize(test_case_id, title)
       self.test_case_id = test_case_id
-      self.title        = title
+      self.title = title
+      self.previous_comment = TestRail::Connection.get_last_failed_comment(test_case_id) unless Connection.get_indexes_of_fails(test_case_id).empty?
     end
 
     #
@@ -30,10 +33,11 @@ module TestRail
     def to_test_rail_api
       comment_message = "#{self.comment[:comment]} \"#{self.title}\""
       comment_message += "\n Exception : #{self.exception_message}" unless self.exception_message.nil?
-      if  self.comment[:status] == COMMENT_STATUS
-        { comment: comment_message }
+      comment_message += "\n #{self.previous_comment}" if self.comment[:status] == COMMENT[:fail][:status] || self.comment[:status] == COMMENT[:unchanged_pass][:status]
+      if self.comment[:status] == COMMENT_STATUS
+        {comment: comment_message}
       else
-        { status_id: self.comment[:status], comment: comment_message }
+        {status_id: self.comment[:status], comment: comment_message}
       end
     end
 

data/lib/test_rail_integration/generator/test_rail_data_load.rb

@@ -2,13 +2,13 @@ require 'yaml'
 
 module TestRail
   class TestRailDataLoad
-    CONFIG_PATH ||= ('config/data/test_rail_data.yml')
+    TEST_RAIL_FILE_CONFIG_PATH ||= ('config/data/test_rail_data.yml')
 
     #
     # Loading of test rail information
     #
     def self.test_rail_data
-      YAML.load(File.open(CONFIG_PATH))
+      YAML.load(File.open(TEST_RAIL_FILE_CONFIG_PATH))
     end
   end
 end

data/lib/test_rail_integration/generator/test_rail_hooks.rb

@@ -9,21 +9,23 @@ module TestRail
     def self.update_test_rail(scenario)
       test_case_id = scenario.source_tag_names.find { |e| e.match(TEST_RAIL_ID_REGEX) }[2..-1]
 
-      prev_result              = TestRail::Connection.get_previous_test_result(test_case_id)
-      both_run_result          = scenario.passed? || RunInformation.second_run_result == 0
-      test_case_result         = TestRail::TestCaseResult.new(test_case_id, scenario.title)
+      prev_result = TestRail::Connection.get_previous_test_result(test_case_id)
+      run_result = scenario.passed?
+      test_case_result = TestRail::TestCaseResult.new(test_case_id, scenario.title)
 
-      test_case_result.comment = TestRail::TestCaseResult::COMMENT[:pass] if passed_result?(both_run_result, prev_result)
-      test_case_result.comment ||= TestRail::TestCaseResult::COMMENT[:unchanged_pass] if unchanged_pass_result?(both_run_result, prev_result)
+      test_case_result.comment = TestRail::TestCaseResult::COMMENT[:pass] if passed_result?(run_result, prev_result)
+      test_case_result.comment ||= TestRail::TestCaseResult::COMMENT[:unchanged_pass] if unchanged_pass_result?(run_result, prev_result)
 
-      if failed_result?(both_run_result)
+      if failed_result?(run_result)
         test_case_result.comment ||= TestRail::TestCaseResult::COMMENT[:fail]
         test_case_result.exception_message = scenario.steps.exception rescue nil
+        test_case_result.assign_to = TestRail::TestCaseResult::ASSIGN_TO
       end
 
-      raise("Invalide test case result : scenario.passed? #{scenario.passed?}, both_run_result? #{both_run_result}  prev_result? #{prev_result}") if test_case_result.comment.nil?
+      raise("Invalid test case result : scenario.passed? #{scenario.passed?}, prev_result? #{prev_result}, run_result? #{run_result}") if test_case_result.comment.nil?
 
       TestRail::Connection.commit_test_result(test_case_result)
+
     end
 
     def self.failed_result?(result)

data/lib/test_rail_integration/generator/test_rail_tools.rb

@@ -10,13 +10,14 @@ module TestRail
     #
     # generate_cucumber_execution_file(2)
     #
-    # cucumber -p lazada.vn.live_test TESTRAIL=1 --color -f json -o cucumber.json -t  @C6162,@C6163,@C6164
+    # cucumber -p profile.vn.live_test TESTRAIL=1 --color -f json -o cucumber.json -t  @C666,@C777,@C555
     #
     # change this method for create your own cucumber executable
     #
-    def self.generate_cucumber_execution_file(id_of_run)
-      parameters    = TestRunParameters.new
-      command       = "cucumber -p lazada.#{parameters.venture}.#{parameters.environment} TESTRAIL=1 --color -f json -o cucumber.json -t  " + Connection.cases_id(id_of_run).map { |id| "@C"+id.to_s }.join(",")
+    def self.generate_cucumber_execution_file(id_of_run, env = nil)
+      parameters = TestRunParameters.new(env)
+      #TODO do smth with weird replacement
+      command = parameters.command.gsub("\#{parameters.venture}", parameters.venture).gsub("\#{parameters.environment}", parameters.environment) + Connection.cases_id(id_of_run).map { |id| "@C"+id.to_s }.join(",")
       cucumber_file = File.new("cucumber_run.sh", "w")
       cucumber_file.chmod(0700)
       cucumber_file.write("#!/bin/sh\n")
@@ -28,8 +29,8 @@ module TestRail
     # Writing test run ID into test rail data file
     #
     def self.write_test_run_id(test_run_id)
-      test_rail_data_file = File.read(TestRailDataLoad::CONFIG_PATH).gsub(/^:test_run_id: \d+/, ":test_run_id: #{test_run_id}")
-      config_file        = File.open(TestRailDataLoad::CONFIG_PATH, "w")
+      test_rail_data_file = File.read(TestRailDataLoad::TEST_RAIL_FILE_CONFIG_PATH).gsub(/^:test_run_id:.*/, ":test_run_id: #{test_run_id}")
+      config_file = File.open(TestRailDataLoad::TEST_RAIL_FILE_CONFIG_PATH, "w")
       config_file.write (test_rail_data_file)
       config_file.close
     end
@@ -37,10 +38,10 @@ module TestRail
     #
     # Preparation for create right cucumber executable file
     #
-    def self.prepare_config(run_id)
+    def self.prepare_config(run_id, env = nil)
       Connection.test_run_id = run_id
       write_test_run_id(run_id)
-      generate_cucumber_execution_file(run_id)
+      generate_cucumber_execution_file(run_id, env)
     end
   end
 end

data/lib/test_rail_integration/generator/test_run_creation.rb

@@ -0,0 +1,49 @@
+require_relative 'test_rail_data_load'
+require_relative 'connection'
+require_relative 'test_run_parameters'
+
+module TestRail
+  class TestRunCreation
+
+    #
+    # Get all test run names for project
+    #
+    def self.get_test_runs_names
+      test_runs = Connection.get_test_runs
+      test_runs_names = []
+      test_runs.each { |test_run| test_runs_names.push(test_run.fetch("name")) }
+      test_runs_names
+    end
+
+    #
+    # Get id for new test run that we created
+    #
+    def self.get_created_test_run_id
+      test_runs = Connection.get_test_runs
+      created_test_run_id = test_runs.map { |test_run|
+        test_run.fetch("id") if test_run.fetch("name").eql? Connection.generate_test_run_name
+      }
+      TestRailTools.write_test_run_id(created_test_run_id.first)
+      created_test_run_id.first
+    end
+
+    #
+    # Checking that test run already created
+    #
+    def self.check_presence_of_test_run
+      TestRunCreation.get_test_runs_names.include? Connection.generate_test_run_name
+    end
+
+    #
+    # Check and create test run
+    #
+    def self.initialize_test_run
+      unless TestRunCreation.check_presence_of_test_run
+        Connection.create_new_test_run_with_name
+      end
+      TestRunCreation.get_created_test_run_id
+    end
+
+  end
+
+end

data/lib/test_rail_integration/generator/test_run_parameters.rb

@@ -2,22 +2,28 @@ require_relative 'API_client'
 
 module TestRail
   class TestRunParameters
-    VENTURE_REGEX     ||= TestRail::TestRailDataLoad.test_rail_data[:ventures]
+    VENTURE_REGEX ||= TestRail::TestRailDataLoad.test_rail_data[:ventures]
     ENVIRONMENT_REGEX ||= TestRail::TestRailDataLoad.test_rail_data[:environments]
+    CHECK_TEST_RUN_NAME ||= TestRail::TestRailDataLoad.test_rail_data[:check_test_run_name]
+    EXEC_COMMAND ||= TestRail::TestRailDataLoad.test_rail_data[:exec_command]
 
-    attr_accessor :environment, :venture
+    attr_accessor :environment, :venture, :command
 
     #
-    # Checking of correct naming of created test run and return parameters for runnng test run
+    # Checking of correct naming of created test run and return parameters for running test run
     #
-    def initialize
-      parameters = Connection.test_run_name.downcase.match(/(#{VENTURE_REGEX}) (#{ENVIRONMENT_REGEX})*/)
-      begin
-        @venture     = parameters[1]
-        @environment = parameters[2]
-      rescue Exception
-        raise ("The test run name is not valid. Format: 'venture env description'")
+    def initialize(env=nil)
+      @venture = ""
+      @environment = ""
+      if env
+        if env[0]
+          @venture = env[0] if env[0].match(/(#{VENTURE_REGEX})/)
+        end
+        if env[1]
+          @environment = env[1] if env[1].match(/(#{ENVIRONMENT_REGEX})/)
+        end
       end
+      @command = EXEC_COMMAND
     end
   end
 end

data/lib/test_rail_integration/version.rb

@@ -1,3 +1,3 @@
 module TestRailIntegration
-  VERSION = "0.0.6"
+  VERSION = "0.0.6.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_rail_integration
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.6.24
 platform: ruby
 authors:
 - Kirikami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,6 +173,7 @@ files:
 - lib/test_rail_integration/generator/test_rail_data_load.rb
 - lib/test_rail_integration/generator/test_rail_hooks.rb
 - lib/test_rail_integration/generator/test_rail_tools.rb
+- lib/test_rail_integration/generator/test_run_creation.rb
 - lib/test_rail_integration/generator/test_run_parameters.rb
 - lib/test_rail_integration/version.rb
 - test_rail_integration.gemspec