test_rail_integration 0.0.8.9 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0651cb6aabdecfe9a50f505e029038dbbb2c4fcd
-  data.tar.gz: 5b9eea8b4cfd649b35477e3f6de116b3166133d5
+  metadata.gz: f7c37b512c02fe5a2b92d5e28c38d7c010f6f1c2
+  data.tar.gz: 3b0c49e57e8afb605ada67a2e146dfa9ab9a1dc8
 SHA512:
-  metadata.gz: 8b8ceec7cb756c098a32303013da483be093a7933e772a77b052881593aec14df77c552bb5183f8012da590c46833d1398dc0d521fe0a4052d777dbb00038982
-  data.tar.gz: 22dd7beb287162d2be292622300934ef204d53119b768ad3823634b0db6beeef1d0255e0b7fe00e59b55597b901b6be0e22cee1ff71920ba36c57070e6dc4440
+  metadata.gz: 5fd5ef3b558c16caed8781cae8848c7bacd26fe486dc29f1f3f90b52dd5c497ea14362bfe6029a846b95fcb21f820e24d11709b8d33ff6cc026eed21d3059ae0
+  data.tar.gz: bfbe8e4a8783f1a894d63ae1449258345803bf342cdf1b9979e13e56f895ff80332f08d042fda90b59a034635ace21cc00571369b1685c12caa5dddcb19ca1ab

data/lib/test_rail_integration/cli.rb

@@ -2,6 +2,7 @@ require 'thor'
 require_relative 'generator/project'
 require_relative 'generator/project/check'
 require_relative 'generator/test_run'
+require_relative 'generator/command'
 
 class CLI < Thor
   include TestRail
@@ -43,30 +44,74 @@ class CLI < Thor
        --venture for describing venture,
        --env for describing environment for run,
        --showroom with showroom name where start tests,
-       --command with new command"
+       --command with new command,
+       --auto for getting env, venture params from test run name,
+       --simple for run without venture and env params."
   option :test_run_id
   option :venture
   option :showroom
   option :command
   option :env
+  option :auto
+  option :simple
   def shoot
     if options[:test_run_id]
-      run_id = options[:test_run_id]
-      name_of_environment = Connection.test_run_name(run_id).downcase.match(/(#{TestRunParameters::VENTURE_REGEX}) (#{TestRunParameters::ENVIRONMENT_REGEX})*/)
-      environment_for_run = name_of_environment[1], name_of_environment[2] if name_of_environment
-      environment_for_run[0] = options[:venture] if options[:venture]
-      environment_for_run[1] = options[:env] if options[:env]
-      if environment_for_run[1] == "showroom"
-        if options[:showroom]
-          environment_for_run[1] = environment_for_run[1] + " SR='#{options[:showroom]}'"
-        else
-          environment_for_run[1] = environment_for_run[1]
+      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"
+        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
+        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
+        command.command = TestRunParameters::EXEC_COMMAND
       end
-      command = options[:command] if options[:command]
-      Connection.test_run_id = run_id
-      TestRailTools.write_test_run_id(run_id)
-      TestRailTools.execute_generated_command(run_id, environment_for_run, command)
+      command.generate
+      command.execute
     else
       puts "You must set correct test run id through --test_run_id"
     end

data/lib/test_rail_integration/generator/command.rb

@@ -0,0 +1,36 @@
+module TestRail
+
+  class Command
+
+    attr_accessor :command,
+                  :tags,
+                  :venture,
+                  :env
+
+    def initialize(id_of_run)
+      self.tags = get_tags(id_of_run)
+    end
+    
+    def execute
+      p "Gem will execute command: #{self.command}"
+      TestRail::Command.execute_command("#{self.command}")
+    end
+    
+    def generate
+      #TODO do smth with weird replacement
+      if venture.nil? || env.nil?
+        self.command = self.command + " " + self.tags
+      else
+        self.command = self.command.gsub("\#{parameters.venture}", self.venture).gsub("\#{parameters.environment}", self.env) + " " + self.tags
+      end
+    end
+
+    def get_tags(id_of_run)
+      Connection.cases_id(id_of_run).map { |id| "@C"+id.to_s }.join(",")
+    end
+
+    def self.execute_command(command)
+      exec("#{command}")
+    end
+  end
+end

data/lib/test_rail_integration/generator/test_rail_tools.rb

@@ -5,26 +5,6 @@ require_relative 'test_run_parameters'
 module TestRail
   class TestRailTools
 
-    #
-    # Method generates executable command
-    #
-    # 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_executable_command(id_of_run, env = nil, command = nil)
-      parameters = TestRunParameters.new(env, command)
-      #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(",")
-      command
-    end
-
-    def self.execute_generated_command(id_of_run, env = nil, command = nil)
-      exec_command = generate_executable_command(id_of_run, env, command)
-      p "Gem will execute command: #{exec_command}"
-      exec("#{exec_command}")
-    end
-
     #
     # Writing test run ID into test rail data file
     #
@@ -35,7 +15,6 @@ module TestRail
       config_file.close
       test_run_id
     end
-
   end
 end
 

data/lib/test_rail_integration/generator/test_run.rb

@@ -2,16 +2,22 @@ module TestRail
 
   class TestRun
 
-    attr_accessor :id
+    attr_accessor :id, :name
 
     private
     def initialize(result)
       self.id = result["id"]
+      self.name = result["name"]
     end
 
     def self.create(test_run_name)
       command_result = TestRail::Connection.create_test_run_with_name(test_run_name)
       TestRun.new(command_result)
     end
+
+    def self.get_by_id(test_run_id)
+      command_result = Connection.test_run_data(test_run_id)
+      TestRun.new(command_result)
+    end
   end
 end

data/lib/test_rail_integration/generator/test_run_parameters.rb

@@ -6,25 +6,5 @@ module TestRail
     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, :command
-
-    #
-    # Checking of correct naming of created test run and return parameters for running test run
-    #
-    def initialize(env = nil, command = 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
-      @command = command if command
-    end
   end
 end

data/lib/test_rail_integration/version.rb

@@ -1,3 +1,3 @@
 module TestRailIntegration
-  VERSION = "0.0.8.9"
+  VERSION = "0.0.9"
 end

data/spec/cli_spec.rb

@@ -2,7 +2,6 @@ require 'rspec'
 require_relative '../lib/test_rail_integration/cli'
 require_relative '../lib/test_rail_integration/generator/connection'
 
-
 describe CLI do
 
   before(:all) do
@@ -128,20 +127,14 @@ describe CLI do
   context 'when executing shoot cli command' do
 
     before(:each) do
-      allow(TestRail::Connection).to receive(:test_run_name).and_return("AT id staging new")
       allow(TestRail::Connection).to receive(:cases_id).and_return(["11", "22", "33"])
-      allow(TestRail::TestRailTools).to receive(:exec).and_return("Ok")
+      allow(TestRail::Command).to receive(:execute_command).and_return("Ok")
     end
 
     context 'and not passing test run id param' do
 
-      before(:each) do
-        allow(TestRail::Connection).to receive(:test_run_name).and_return("AT id staging new")
-        allow(TestRail::Connection).to receive(:cases_id).and_return(["11", "22", "33"])
-      end
-
       it 'should not execute command once' do
-        expect(TestRail::TestRailTools).not_to receive(:exec)
+        expect(TestRail::Command).not_to receive(:execute_command)
         @subject.shoot
       end
 
@@ -158,124 +151,331 @@ describe CLI do
         @subject.options = {:test_run_id => 777}
       end
 
-      after(:all) do
+      after(:each) do
         @subject.options.clear
       end
 
-      it 'should call execution command' do
-        expect(TestRail::TestRailTools).to receive(:exec)
-        @subject.shoot
-      end
+      context 'and receiving simple param' do
 
-      it 'should execute correct command' do
-        result = capture(:stdout) { @subject.shoot }
-        expect(result).to eq("\"Gem will execute command: cucumber -p lazada.id.staging TESTRAIL=1 --color -f json -o cucumber.json -t @C11,@C22,@C33\"\n")
-      end
+        before(:each) do
+          @subject.options[:simple] = ''
+        end
 
-        context 'and passing venture param' do
+        context 'and passing required command param' do
 
           before(:each) do
-            @subject.options[:venture] = 'vn'
+            @subject.options[:command] = 'command'
           end
 
-          after(:each) do
-            @subject.options.delete("venture")
+          it 'should call execution command' do
+            expect(TestRail::Command).to receive(:execute_command)
+            @subject.shoot
           end
 
-          it 'should execute correct command' do
+          it 'should have output' do
             result = capture(:stdout) { @subject.shoot }
-            expect(result).to eq("\"Gem will execute command: cucumber -p lazada.vn.staging TESTRAIL=1 --color -f json -o cucumber.json -t @C11,@C22,@C33\"\n")
+            expect(result).to eq("\"Gem will execute command: command @C11,@C22,@C33\"\n")
           end
 
-          it 'should call execution command' do
-            expect(TestRail::TestRailTools).to receive(:exec)
+        end
+
+        context 'and not passing required command param' do
+
+          it 'should not call execution command' do
+            expect(TestRail::Command).not_to receive(:execute_command)
             @subject.shoot
           end
 
+          it 'should have output' do
+            result = capture(:stdout) { @subject.shoot }
+            expect(result).to eq("You should add command param to execute simple execution\n")
+          end
 
         end
 
-        context 'and passing env param' do
+      end
 
-          before(:each) do
-            @subject.options[:env] = 'live_test'
-          end
+      context 'and receiving --auto param' do
+
+        before(:each) do
+          @subject.options[:auto] = ''
+        end
+
+        context 'and test run name is incorrect' do
+
+          context 'and it dont have venture inside' do
+
+            before(:each) do
+              allow(TestRail::Connection).to receive(:test_run_data).and_return(
+                                                 {"name" => "AT hh staging"})
+            end
+
+            it 'should not call execution command' do
+              expect(TestRail::Command).not_to receive(:execute_command)
+              @subject.shoot
+            end
+
+            it 'should have output' do
+              result = capture(:stdout) { @subject.shoot }
+              expect(result).to eq("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.\n")
+            end
 
-          after(:all) do
-            @subject.options.delete("env")
           end
 
-          it 'should execute correct command' do
-            result = capture(:stdout) { @subject.shoot }
-            expect(result).to eq("\"Gem will execute command: cucumber -p lazada.id.live_test TESTRAIL=1 --color -f json -o cucumber.json -t @C11,@C22,@C33\"\n")
+          context 'and it dont have env inside' do
+
+            before(:each) do
+              allow(TestRail::Connection).to receive(:test_run_data).and_return(
+                                                 {"name" => "AT id error"})
+            end
+
+            it 'should not call execution command' do
+              expect(TestRail::Command).not_to receive(:execute_command)
+              @subject.shoot
+            end
+
+            it 'should have output' do
+              result = capture(:stdout) { @subject.shoot }
+              expect(result).to eq("Your test run name is not correct. It don't contain env param. Please provide correct name for test run on test rail side.\n")
+            end
+
           end
 
-          it 'should call execution command' do
-            expect(TestRail::TestRailTools).to receive(:exec)
-            @subject.shoot
+          context 'and it dont have any params inside' do
+
+            before(:each) do
+              allow(TestRail::Connection).to receive(:test_run_data).and_return(
+                                                 {"name" => "Simple test run name"})
+            end
+
+            it 'should not call execution command' do
+              expect(TestRail::Command).not_to receive(:execute_command)
+              @subject.shoot
+            end
+
+            it 'should have output' do
+              result = capture(:stdout) { @subject.shoot }
+              expect(result).to eq("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.\n")
+            end
+
           end
 
         end
 
-        context 'and passing showroom env param' do
+        context 'and test run name is correct' do
 
           before(:each) do
-            @subject.options[:env] = "showroom"
+            allow(TestRail::Connection).to receive(:test_run_data).and_return(
+                                               {"name" => "AT id staging new"})
           end
 
-          after(:all) do
-            @subject.options.delete("showroom")
+          it 'should call execution command' do
+            expect(TestRail::Command).to receive(:execute_command)
+            @subject.shoot
+          end
+
+          it 'should execute correct command' do
+            result = capture(:stdout) { @subject.shoot }
+            expect(result).to eq("\"Gem will execute command: cucumber -p lazada.id.staging TESTRAIL=1 --color -f json -o cucumber.json -t @C11,@C22,@C33\"\n")
           end
 
-          context 'and not passing SR param' do
+          context 'and passing venture param' do
+
+            before(:each) do
+              @subject.options[:venture] = 'vn'
+            end
+
+            after(:each) do
+              @subject.options.delete("venture")
+            end
 
             it 'should execute correct command' do
               result = capture(:stdout) { @subject.shoot }
-              expect(result).to eq("\"Gem will execute command: cucumber -p lazada.id.showroom TESTRAIL=1 --color -f json -o cucumber.json -t @C11,@C22,@C33\"\n")
+              expect(result).to eq("\"Gem will execute command: cucumber -p lazada.vn.staging TESTRAIL=1 --color -f json -o cucumber.json -t @C11,@C22,@C33\"\n")
             end
 
             it 'should call execution command' do
-              expect(TestRail::TestRailTools).to receive(:exec)
+              expect(TestRail::Command).to receive(:execute_command)
               @subject.shoot
             end
 
           end
 
-          context 'and passing SR param' do
+          context 'and passing env param' do
 
             before(:each) do
-              @subject.options[:showroom] = '111'
+              @subject.options[:env] = 'live_test'
             end
 
-            after(:each) do
-              @subject.options.delete("showroom")
+            after(:all) do
+              @subject.options.delete("env")
+            end
+
+            it 'should execute correct command' do
+              result = capture(:stdout) { @subject.shoot }
+              expect(result).to eq("\"Gem will execute command: cucumber -p lazada.id.staging TESTRAIL=1 --color -f json -o cucumber.json -t @C11,@C22,@C33\"\n")
             end
 
             it 'should call execution command' do
-              expect(TestRail::TestRailTools).to receive(:exec)
+              expect(TestRail::Command).to receive(:execute_command)
               @subject.shoot
             end
 
-            it 'should execute correct command' do
+          end
+
+          context 'and passing new command' do
+
+            before do
+              @subject.options[:command] = 'Command'
+            end
+
+            after do
+              @subject.options.delete("Command")
+            end
+
+            it 'should execute changed command' do
               result = capture(:stdout) { @subject.shoot }
-              expect(result).to eq("\"Gem will execute command: cucumber -p lazada.id.showroom SR='111' TESTRAIL=1 --color -f json -o cucumber.json -t @C11,@C22,@C33\"\n")
+              expect(result).to eq("\"Gem will execute command: Command @C11,@C22,@C33\"\n")
             end
+          end
+        end
+      end
+
+      context 'and not receiving --auto param' do
+
+        before(:each) do
+          allow(TestRail::Connection).to receive(:test_run_data).and_return(
+                                             {"name" => "Simple test run name"})
+        end
+
+        context 'and not passing venture param' do
+
+          before(:each) do
+            @subject.options[:env] = 'live_test'
+          end
+
+          after(:each) do
+            @subject.options.delete("env")
+          end
+
+          it 'should not call execution command' do
+            expect(TestRail::Command).not_to receive(:execute_command)
+            @subject.shoot
+          end
+
+          it 'should see output ' do
+            result = capture(:stdout) { @subject.shoot }
+            expect(result).to eq("You must set correct venture param through --venture in order to execute command\n")
+          end
+
+        end
+
+        context 'and not passing env param' do
+
+          before(:each) do
+            @subject.options[:venture] = 'id'
+          end
+
+          after(:each) do
+            @subject.options.delete("venture")
+          end
+
+          it 'should not call execution command' do
+            expect(TestRail::Command).not_to receive(:execute_command)
+            @subject.shoot
+          end
+
+          it 'should see output ' do
+            result = capture(:stdout) { @subject.shoot }
+            expect(result).to eq("You must set correct env param through --env in order to execute command\n")
+          end
+
+        end
+
+        context 'and not passing venture, env params' do
+
+          it 'should not call execution command' do
+            expect(TestRail::Command).not_to receive(:execute_command)
+            @subject.shoot
+          end
+
+          it 'should see output ' do
+            result = capture(:stdout) { @subject.shoot }
+            expect(result).to eq("You must set correct env, venture params through --env, --venture in order to execute command\n")
+          end
+
+        end
 
+        context 'and passing all required params' do
+
+          before(:each) do
+            @subject.options[:venture] = 'id'
+            @subject.options[:env] = 'live_test'
+          end
+
+          after(:each) do
+            @subject.options.delete("venture")
+            @subject.options.delete("env")
+          end
+
+          it 'should call execution command' do
+            expect(TestRail::Command).to receive(:execute_command)
+            @subject.shoot
+          end
+
+          it 'should execute correct command' do
+            result = capture(:stdout) { @subject.shoot }
+            expect(result).to eq("\"Gem will execute command: cucumber -p lazada.id.live_test TESTRAIL=1 --color -f json -o cucumber.json -t @C11,@C22,@C33\"\n")
           end
         end
+      end
 
-      context 'and passing new command' do
-        before do
-          @subject.options[:command] = 'Command'
+      context 'and passing showroom env param' do
+
+        before(:each) do
+          @subject.options[:env] = "showroom"
+          @subject.options[:venture] = "id"
+        end
+
+        after(:each) do
+          @subject.options.delete("showroom")
+          @subject.options.delete("venture")
         end
 
-        after do
-          @subject.options.delete("Command")
+        context 'and not passing SR param' do
+
+          it 'should execute correct command' do
+            result = capture(:stdout) { @subject.shoot }
+            expect(result).to eq("\"Gem will execute command: cucumber -p lazada.id.showroom TESTRAIL=1 --color -f json -o cucumber.json -t @C11,@C22,@C33\"\n")
+          end
+
+          it 'should call execution command' do
+            expect(TestRail::Command).to receive(:execute_command)
+            @subject.shoot
+          end
+
         end
 
-        it 'should execute changed command' do
-          result = capture(:stdout) { @subject.shoot }
-          expect(result).to eq("\"Gem will execute command: Command @C11,@C22,@C33\"\n")
+        context 'and passing SR param' do
+
+          before(:each) do
+            @subject.options[:showroom] = '111'
+          end
+
+          after(:each) do
+            @subject.options.delete("showroom")
+          end
+
+          it 'should call execution command' do
+            expect(TestRail::Command).to receive(:execute_command)
+            @subject.shoot
+          end
+
+          it 'should execute correct command' do
+            result = capture(:stdout) { @subject.shoot }
+            expect(result).to eq("\"Gem will execute command: cucumber -p lazada.id.showroom SR='111' TESTRAIL=1 --color -f json -o cucumber.json -t @C11,@C22,@C33\"\n")
+          end
+
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_rail_integration
 version: !ruby/object:Gem::Version
-  version: 0.0.8.9
+  version: 0.0.9
 platform: ruby
 authors:
 - Kirikami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,6 +166,7 @@ files:
 - lib/test_rail_integration.rb
 - lib/test_rail_integration/cli.rb
 - lib/test_rail_integration/generator/API_client.rb
+- lib/test_rail_integration/generator/command.rb
 - lib/test_rail_integration/generator/connection.rb
 - lib/test_rail_integration/generator/project.rb
 - lib/test_rail_integration/generator/project/check.rb