Merge pull request #111 from nk-ty/master

Add base_fqdn to use in bucky-management

Author: T-Y89

README.md

@@ -155,7 +155,7 @@ cases:
       - proc: open page
         exec:
           operate: go
-          url: <%= ENV['FQDN'] %>/results # Using erb notation to get environment variable
+          url: <%= ENV['BASE_FQDN'] %>/results # Using erb notation to get environment variable
       - proc: element click
         exec:
           operate: click
@@ -224,7 +224,7 @@ cases:
     desc: status check for detail page
     urls:
         - https://example.com/detail/1
-        - <%= ENV['FQDN'] %>/detail/2 # Using erb notation to get environment variable
+        - <%= ENV['BASE_FQDN'] %>/detail/2 # Using erb notation to get environment variable
 ```
 
 # Development

exe/bucky

@@ -135,6 +135,7 @@ def setup_test_cond(test_cond)
   %i[suite_name case label xlabel device].each do |k|
     test_cond[k] = test_cond[k].split(',') unless test_cond[k].nil?
   end
+  test_cond[:base_fqdn] = ENV['BASE_FQDN'] ||= ''
   test_cond
 end
 

lib/bucky/core/database/test_data_operator.rb

@@ -15,11 +15,13 @@ def initialize
 
         # Save job data and return job id
         # @param  [Time] start_time
+        # @param  [String] command_and_option
+        # @param  [String] fqdn
         # @return [Fixnum] job_id
-        def save_job_record_and_get_job_id(start_time, command_and_option)
+        def save_job_record_and_get_job_id(start_time, command_and_option, fqdn)
           return 0 if $debug
 
-          job_id = @connector.con[:jobs].insert(start_time: start_time, command_and_option: command_and_option)
+          job_id = @connector.con[:jobs].insert(start_time: start_time, command_and_option: command_and_option, base_fqdn: fqdn)
           @connector.disconnect
           job_id
         end

lib/bucky/core/test_core/test_manager.rb

@@ -93,7 +93,7 @@ def initialize(test_cond)
           @re_test_count = @test_cond[:re_test_count]
           @tdo = Bucky::Core::Database::TestDataOperator.new
           @start_time = Time.now
-          $job_id = @tdo.save_job_record_and_get_job_id(@start_time, @test_cond[:command_and_option])
+          $job_id = @tdo.save_job_record_and_get_job_id(@start_time, @test_cond[:command_and_option], @test_cond[:base_fqdn])
           @json_report = {
             summary: {
               cases_count: 0,

spec/core/database/test_data_operetor_spec.rb

@@ -24,22 +24,23 @@
   describe '#save_job_record_and_get_job_id' do
     let(:start_time) { Time.now }
     let(:command_and_option) { 'bucky run -t e2e' }
+    let(:fqdn) { 'https://example.com' }
     before do
       allow(con_double).to receive(:[]).and_return(sequel_instance_double)
       allow(db_connector_double).to receive(:con).and_return(con_double)
     end
     it 'call Sequel#insert' do
       expect(sequel_instance_double).to receive(:insert)
-      subject.save_job_record_and_get_job_id(start_time, command_and_option)
+      subject.save_job_record_and_get_job_id(start_time, command_and_option, fqdn)
     end
     it 'return job_id' do
       allow(sequel_instance_double).to receive(:insert).and_return(1)
-      expect(subject.save_job_record_and_get_job_id(start_time, command_and_option)).to eq 1
+      expect(subject.save_job_record_and_get_job_id(start_time, command_and_option, fqdn)).to eq 1
     end
     it 'disconnect database' do
       allow(sequel_instance_double).to receive(:insert)
       expect(db_connector_double).to receive(:disconnect)
-      subject.save_job_record_and_get_job_id(start_time, command_and_option)
+      subject.save_job_record_and_get_job_id(start_time, command_and_option, fqdn)
     end
   end