test_rail_integration 0.0.9.1 → 0.0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 358ef63f7961598a1e416d4b51df3b73b1c80b50
-  data.tar.gz: 4c7f618f6398977f3b6095018ac569344789f834
+  metadata.gz: d6be0e981007474d44975ad766ef17025330fe2e
+  data.tar.gz: fbb645c2798102f90b0ac8c83e57e6b899d62ec0
 SHA512:
-  metadata.gz: cbbda4abe090101224b3b8cef74355b4663d6a84aae974bd20cd458218c93eb644934e70184909d4bd27c266979a9725c9e7e65b3478b2b4f19cdde8153475b2
-  data.tar.gz: 97eeab62fc159b2353b2a864c1fe2cb84ca2cb5770dc00412e5d9bfc85d8650c97d2865ee3511d8841ea9d6fbd1a12d75a2664705eed513f8a36c2b8d1e8af1c
+  metadata.gz: 8af6f8a8e1ec04bd87b420749b36db0460fc09415cb74b7654ba5e9043dee68ea4b2e9c1a625c3afefeef3327085773cfb6b3a8b57648d3440f93ae4334831b9
+  data.tar.gz: fbe01707a5abd6aacee25c06f6ab6d62bc7cc9e6d78edcf8bc4476c15091680b2c6e7aa3e65d5266a84460360cf8f43c2d935fb134d4bd4f11bccec421468c18

data/lib/test_rail_integration/cli.rb

@@ -8,37 +8,43 @@ class CLI < Thor
   include TestRail
 
   desc "perform", "Creates project for interaction with TestRail"
+
   def perform
     TestRail::Generators::Project.copy_file("test_rail_data.yml", "config/data/")
   end
 
-  desc "check_test_run_and_update", "Check test run statuses and update. Set test run id through --test_run_id parameter"
+  desc "check_test_run_and_update", "Check test run statuses and update. Set test run id through --test_run_id parameter, --build_url for adding build url to test run description"
   option :test_run_id
+  option :build_url
+
   def check_test_run_and_update
-    if options[:test_run_id]
+    if options[:build_url] && options[:test_run_id]
+    TestRail::Connection.write_build_url(options[:test_run_id], options[:build_url])
+    elsif options[:test_run_id]
       TestRail::Check.check_test_run_statuses(options[:test_run_id])
     else
       puts "You must set correct test run id through --test_run_id"
     end
-  end
+end
 
-  desc "create_test_run", "Create test run with name. Set test run name through --test_run_name parameter"
-  option :test_run_name
-  def create_test_run
-    test_run_name = options[:test_run_name]
-    if test_run_name
-      if test_run_name == ''
-        puts "Test_run_name parameter should not be empty"
-      else
-        test_run = TestRail::TestRun.create(test_run_name)
-        puts "You successfully created test run with id #{test_run.id}"
-      end
+desc "create_test_run", "Create test run with name. Set test run name through --test_run_name parameter"
+option :test_run_name
+
+def create_test_run
+  test_run_name = options[:test_run_name]
+  if test_run_name
+    if test_run_name == ''
+      puts "Test_run_name parameter should not be empty"
     else
-      puts "You must set correct test run name through --test_run_name\n"
+      test_run = TestRail::TestRun.create(test_run_name)
+      puts "You successfully created test run with id #{test_run.id}"
     end
+  else
+    puts "You must set correct test run name through --test_run_name\n"
   end
+end
 
-  desc "shoot", "Run Test Rail integration with \n
+desc "shoot", "Run Test Rail integration with \n
        --test_run_id for run id,
         optional:
        --venture for describing venture,
@@ -48,78 +54,80 @@ class CLI < Thor
        --auto for getting env, venture params from test run name,
        --simple for run without venture and env params,
        --type to define tests with type to execute."
-  option :test_run_id
-  option :venture
-  option :showroom
-  option :command
-  option :env
-  option :auto
-  option :simple
-  option :type
-  def shoot
-    if options[:test_run_id]
-      test_run_id = options[:test_run_id]
-      Connection.test_run_id = test_run_id
-      TestRailTools.write_test_run_id(test_run_id)
-      command = TestRail::Command.new(test_run_id)
-      if options[:auto]
-        parameters = TestRail::TestRun.get_by_id(test_run_id).name.downcase.match(/(#{TestRunParameters::VENTURE_REGEX}) (#{TestRunParameters::ENVIRONMENT_REGEX})*/)
-        if parameters.nil?
-          puts "Your test run name is not correct. It don't contain venture, env params. Please provide correct name for test run on test rail side."
-          return
-        end
-        if parameters[1].nil?
-          puts "Your test run name is not correct. It don't contain venture param. Please provide correct name for test run on test rail side."
-          return
-        end
-        if parameters[2].nil?
-          puts "Your test run name is not correct. It don't contain env param. Please provide correct name for test run on test rail side."
-          return
-        end
-        if parameters
-          # TODO venture can be everything
-          if options[:venture]
-            command.venture = options[:venture]
-          else
-            command.venture = parameters[1]
-          end
-          command.env = parameters[2]
-        end
-      elsif options[:simple] && !options[:command]
-        puts "You should add command param to execute simple execution"
+option :test_run_id
+option :venture
+option :showroom
+option :command
+option :env
+option :auto
+option :simple
+option :type
+
+def shoot
+  if options[:test_run_id]
+    test_run_id = options[:test_run_id]
+    Connection.test_run_id = test_run_id
+    TestRailTools.write_test_run_id(test_run_id)
+    command = TestRail::Command.new(test_run_id)
+    if options[:auto]
+      parameters = TestRail::TestRun.get_by_id(test_run_id).name.downcase.match(/(#{TestRunParameters::VENTURE_REGEX}) (#{TestRunParameters::ENVIRONMENT_REGEX})*/)
+      if parameters.nil?
+        puts "Your test run name is not correct. It don't contain venture, env params. Please provide correct name for test run on test rail side."
         return
-      elsif !options[:simple] && !options[:command]
-        if options[:venture].nil? && options[:env].nil?
-          puts "You must set correct env, venture params through --env, --venture in order to execute command"
-          return
-        end
-        if options[:venture].nil?
-          puts "You must set correct venture param through --venture in order to execute command"
-          return
-        end
-        if options[:env].nil?
-          puts "You must set correct env param through --env in order to execute command"
-          return
+      end
+      if parameters[1].nil?
+        puts "Your test run name is not correct. It don't contain venture param. Please provide correct name for test run on test rail side."
+        return
+      end
+      if parameters[2].nil?
+        puts "Your test run name is not correct. It don't contain env param. Please provide correct name for test run on test rail side."
+        return
+      end
+      if parameters
+        # TODO venture can be everything
+        if options[:venture]
+          command.venture = options[:venture]
+        else
+          command.venture = parameters[1]
         end
-        command.venture = options[:venture]
-        command.env = options[:env]
+        command.env = parameters[2]
       end
-      if options[:env] == "showroom" && options[:showroom]
-        command.env = command.env + " SR='#{options[:showroom]}'"
+    elsif options[:simple] && !options[:command]
+      puts "You should add command param to execute simple execution"
+      return
+    elsif !options[:simple] && !options[:command]
+      if options[:venture].nil? && options[:env].nil?
+        puts "You must set correct env, venture params through --env, --venture in order to execute command"
+        return
       end
-      if options[:command]
-        command.command = options[:command]
-      else
-        command.command = TestRunParameters::EXEC_COMMAND
+      if options[:venture].nil?
+        puts "You must set correct venture param through --venture in order to execute command"
+        return
       end
-      if options[:type]
-        command.type = options[:type].to_i
+      if options[:env].nil?
+        puts "You must set correct env param through --env in order to execute command"
+        return
       end
-      command.generate
-      command.execute
+      command.venture = options[:venture]
+      command.env = options[:env]
+    end
+    if options[:env] == "showroom" && options[:showroom]
+      command.env = command.env + " SR='#{options[:showroom]}'"
+    end
+    if options[:command]
+      command.command = options[:command]
     else
-      puts "You must set correct test run id through --test_run_id"
+      command.command = TestRunParameters::EXEC_COMMAND
     end
+    if options[:type]
+      command.type = options[:type].to_i
+    end
+    command.generate
+    command.execute
+  else
+    puts "You must set correct test run id through --test_run_id"
   end
 end
 
+end
+

data/lib/test_rail_integration/generator/command.rb

@@ -28,8 +28,7 @@ module TestRail
     end
 
     def get_tags
-      cases = nil
-      if type.nil?
+      if self.type.nil?
         cases = Connection.cases_ids_by_default(self.id)
       else
         cases = Connection.cases_ids_by_type(self.id, self.type)

data/lib/test_rail_integration/generator/connection.rb

@@ -121,6 +121,9 @@ module TestRail
       case_ids
     end
 
+    #
+    # Get info about test cases from TestRail
+    #
     def self.get_case_info(case_id)
       client.send_get("get_case/#{case_id}")
     end
@@ -135,5 +138,20 @@ module TestRail
       client.send_post("update_run/#{run_id}", {name: new_name})
     end
 
+    #
+    # Update test run with fields
+    #
+    def self.update_test_run(run_id, name_of_run = nil, description = nil, assigned_to_id = nil )
+      client.send_post("update_run/#{run_id}", {name: name_of_run, description: description, assignedto_id: assigned_to_id})
+    end
+
+    #
+    # Write TeamCity build id to TestRail
+    #
+    def self.write_build_url(test_run_id, build_id)
+      description = "Build url: #{build_id}"
+      update_test_run(test_run_id, nil, description, nil)
+    end
+
   end
 end

data/lib/test_rail_integration/version.rb

@@ -1,3 +1,3 @@
 module TestRailIntegration
-  VERSION = "0.0.9.1"
+  VERSION = "0.0.9.2"
 end

data/spec/cli_spec.rb

@@ -64,6 +64,26 @@ describe CLI do
 
     end
 
+    context 'passing test run id and build url' do
+      before :each do
+        @subject.options = {:build_url => 'http://teamcity.ua/buildnum123', :test_run_id => 12345}
+      end
+
+      after :all do
+        @subject.options.clear
+      end
+
+      it 'should send update command' do
+        expect(TestRail::Connection).to receive(:write_build_url)
+        @subject.check_test_run_and_update
+      end
+
+      it 'should send data to Test Rail' do
+        expect(TestRail::Connection).to receive(:update_test_run).and_return("#{@subject.options[:test_run_id]}, nil, #{@subject.options[:build_url]}, nil")
+        @subject.check_test_run_and_update
+      end
+    end
+
   end
 
   context 'when executing create_test_run command' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_rail_integration
 version: !ruby/object:Gem::Version
-  version: 0.0.9.1
+  version: 0.0.9.2
 platform: ruby
 authors:
 - Kirikami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler