Merge pull request #1081 from alphagov/update-package-test

Update package test as test data has changed

Author: kentsanggds

app/lib/ckan/v26/depaginator.rb

@@ -83,8 +83,11 @@ def depaginate
       attr_reader(:base_url, :existing_total, :results)
 
       class DeletionTooLargeError < StandardError; end
+
       class ExpectedTotalChangedError < StandardError; end
+
       class MoreResultsThanExpectedError < StandardError; end
+
       class EarlyEmptyPageError < StandardError; end
     end
   end

app/models/datafile.rb

@@ -90,11 +90,12 @@ def validate_date_input
   end
 
   def validate_date
-    if (begin
-          daily_date
-        rescue StandardError
-          ArgumentError
-        end) == ArgumentError
+    if (
+      begin
+        daily_date
+      rescue StandardError
+        ArgumentError
+      end) == ArgumentError
       errors.add(:date, "Please enter a valid date")
     end
   end

app/validators/url_validator.rb

@@ -59,7 +59,7 @@ def valid_path?(record)
   end
 
   def create_validation_error(record, error)
-    Rails.logger.debug("Validation error: " + error)
+    Rails.logger.debug("Validation error: #{error}")
     record.errors[:url] << "Please enter a valid url"
     false
   end

config/environments/development.rb

@@ -39,7 +39,7 @@
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
-  config.logger = ActiveSupport::Logger.new(STDOUT)
+  config.logger = ActiveSupport::Logger.new($stdout)
 
   # Highlight code that triggered database queries in logs.
   config.active_record.verbose_query_logs = true

config/environments/integration.rb

@@ -1,8 +1,7 @@
 require_relative "./production"
 
 Rails.application.configure do
-    config.assets.compile = true
-    config.ckan_v26_base_url = "https://ckan.integration.publishing.service.gov.uk"
-    config.test_publisher = ""
-  end
-  
+  config.assets.compile = true
+  config.ckan_v26_base_url = "https://ckan.integration.publishing.service.gov.uk"
+  config.test_publisher = ""
+end

config/environments/production.rb

@@ -80,7 +80,7 @@
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
 
   if ENV["RAILS_LOG_TO_STDOUT"].present?
-    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger           = ActiveSupport::Logger.new($stdout)
     logger.formatter = config.log_formatter
     config.logger    = ActiveSupport::TaggedLogging.new(logger)
   end

config/puma.rb

@@ -4,13 +4,13 @@
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
 #
-max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+max_threads_count = ENV.fetch("RAILS_MAX_THREADS", 5)
 min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
 threads min_threads_count, max_threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
-port        ENV.fetch("PORT") { 3000 }
+port        ENV.fetch("PORT", 3000)
 
 # Specifies the `environment` that Puma will run in.
 #

lib/tasks/fix_existing_organogram_filenames.rake

@@ -1,4 +1,4 @@
-require_relative "update_organogram_filenames.rb"
+require_relative "update_organogram_filenames"
 
 desc "Fix existing organogram filenames"
 task "fix_existing_organogram_filenames" => :environment do

lib/tasks/update_organogram_filenames.rb

@@ -33,8 +33,8 @@ def replace_urls
 
         index = @old_urls.index(link.url)
         if !index.nil?
-          puts "From dataset: " + link.dataset.name
-          puts "Replace url '" + link.url + "' with '" + @new_urls[index] + "'"
+          puts "From dataset: #{link.dataset.name}"
+          puts "Replace url '#{link.url}' with '#{@new_urls[index]}'"
           link.url = @new_urls[index]
           link.save!(validate: false)
 
@@ -44,7 +44,7 @@ def replace_urls
             puts "Url successfully replaced"
           end
         else
-          puts "WARNING: " + link.url + " not found"
+          puts "WARNING: #{link.url} not found"
         end
         puts "==============="
       end

scripts/set-credential.rb

@@ -17,7 +17,7 @@
 puts "Using secrets service '#{secret_service['name']}'"
 puts "\nWARNING! This is a potentially destructive operation!"
 puts "Do you wish to continue changing #{key} on #{secret_service['name']}? [yN]"
-unless %w[y yes].include?(STDIN.gets.chomp.downcase)
+unless %w[y yes].include?($stdin.gets.chomp.downcase)
   puts "Aborting"
   exit
 end

scripts/unset-credential.rb

@@ -36,7 +36,7 @@ def delete_cred
 end
 
 def user_response
-  STDIN.gets.chomp.downcase
+  $stdin.gets.chomp.downcase
 end
 
 def user_cancels?

spec/features/ckan_v26_package_sync_spec.rb

@@ -8,10 +8,10 @@
   let(:package_show_create) { JSON.parse(file_fixture("ckan/v26/package_show_create.json").read) }
   let(:package_show_update) { JSON.parse(file_fixture("ckan/v26/package_show_update.json").read) }
 
-  let(:dataset_to_update_id) { search_dataset_p1["results"][0]["id"] }
-  let(:dataset_not_to_update_id) { search_dataset_p1["results"][1]["id"] }
-  let(:dataset_to_create_id) { search_dataset_p1["results"][2]["id"] }
-  let(:dataset_from_test_publisher_id) { search_dataset_p1["results"][4]["id"] }
+  let(:dataset_to_update_id) { search_dataset_p1["result"]["results"][0]["id"] }
+  let(:dataset_not_to_update_id) { search_dataset_p1["result"]["results"][1]["id"] }
+  let(:dataset_to_create_id) { search_dataset_p1["result"]["results"][2]["id"] }
+  let(:dataset_from_test_publisher_id) { search_dataset_p1["result"]["results"][4]["id"] }
 
   let!(:dataset_to_delete) { create :dataset, legacy_name: "dataset_to_delete" }
   let!(:dataset_to_ignore) { create :dataset, legacy_name: nil }
@@ -20,9 +20,9 @@
     create(
       :dataset,
       legacy_name: "dataset_to_reimport",
-      uuid: search_dataset_p1["results"][3]["id"],
+      uuid: search_dataset_p1.dig("result", "results", 3, "id"),
       status: "draft",
-      updated_at: Time.zone.parse(search_dataset_p1["results"][3]["metadata_modified"]),
+      updated_at: Time.zone.parse(search_dataset_p1["result"]["results"][3]["metadata_modified"]),
     )
   end
 

spec/lib/tasks/update_organogram_filenames_spec.rb

@@ -1,5 +1,5 @@
 require "rails_helper"
-require_relative "../../../lib/tasks/update_organogram_filenames.rb"
+require_relative "../../../lib/tasks/update_organogram_filenames"
 
 describe UpdateOrganogramFilenames do
   before do

spec/models/datafile_spec.rb

@@ -1,9 +1,9 @@
 require "rails_helper"
 
 describe Datafile, type: :model do
-  DAILY = "daily".freeze
-  MONTHLY = "monthly".freeze
-  ANNUALLY = "annually".freeze
+  daily = "daily".freeze
+  monthly = "monthly".freeze
+  annually = "annually".freeze
 
   before do
     @datafile = FactoryBot.create(:datafile)
@@ -16,9 +16,9 @@
   end
 
   describe "date validation" do
-    describe "associated dataset has frequency: #{ANNUALLY}" do
+    describe "associated dataset has frequency: #{annually}" do
       before(:each) do
-        @datafile.dataset.frequency = ANNUALLY
+        @datafile.dataset.frequency = annually
       end
 
       it "is valid" do
@@ -46,9 +46,9 @@
       end
     end
 
-    describe "associated dataset has frequency: #{MONTHLY}" do
+    describe "associated dataset has frequency: #{monthly}" do
       before(:each) do
-        @datafile.dataset.frequency = MONTHLY
+        @datafile.dataset.frequency = monthly
       end
 
       it "is valid" do
@@ -77,9 +77,9 @@
       end
     end
 
-    describe "associated dataset has frequency #{DAILY}" do
+    describe "associated dataset has frequency #{daily}" do
       before(:each) do
-        @datafile.dataset.frequency = DAILY
+        @datafile.dataset.frequency = daily
       end
 
       it "is valid" do
@@ -106,7 +106,7 @@
 
   describe "before saving" do
     before(:each) do
-      @datafile.dataset.frequency = ANNUALLY
+      @datafile.dataset.frequency = annually
     end
 
     it "sets an end date if year is not nil" do
@@ -134,7 +134,7 @@
       # to save a datafile with no start or end dates
 
       before(:each) do
-        @datafile.dataset.frequency = ANNUALLY
+        @datafile.dataset.frequency = annually
       end
 
       it "does not set an end date if year is nil" do

spec/services/index_deletion_service_spec.rb

@@ -1,10 +1,10 @@
 require "rails_helper"
 
 describe IndexDeletionService do
-  INDEX_CREATED_THIS_MORNING = "datasets-test_20171122070000".freeze
-  INDEX_CREATED_YESTERDAY = "datasets-test_20171121070000".freeze
-  INDEX_CREATED_LAST_WEEK = "datasets-test_20171112070000".freeze
-  INDEX_CREATED_LAST_MONTH = "datasets-test_20171022070000".freeze
+  index_created_this_morning = "datasets-test_20171122070000".freeze
+  index_created_yesterday = "datasets-test_20171121070000".freeze
+  index_created_last_week = "datasets-test_20171112070000".freeze
+  index_created_last_month = "datasets-test_20171022070000".freeze
 
   before(:each) do
     @client_double = double("client")
@@ -22,18 +22,18 @@
   describe "when there are more than three indices" do
     it "deletes the correct number of indices" do
       indexes = [
-        INDEX_CREATED_THIS_MORNING,
-        INDEX_CREATED_YESTERDAY,
-        INDEX_CREATED_LAST_WEEK,
-        INDEX_CREATED_LAST_MONTH,
+        index_created_this_morning,
+        index_created_yesterday,
+        index_created_last_week,
+        index_created_last_month,
       ]
 
       allow(@client_double).to receive_message_chain(:indices, :get_alias, :keys) { indexes }
       allow(@client_double).to receive_message_chain(:indices, :delete)
 
       expect(@client_double.indices)
         .to receive(:delete)
-        .with(index: INDEX_CREATED_LAST_MONTH)
+        .with(index: index_created_last_month)
 
       @index_deleter.run
     end
@@ -42,8 +42,8 @@
   describe "when there are less than three indices" do
     it "deletes the correct number of indices" do
       indexes = [
-        INDEX_CREATED_THIS_MORNING,
-        INDEX_CREATED_LAST_WEEK,
+        index_created_this_morning,
+        index_created_last_week,
       ]
 
       allow(@client_double).to receive_message_chain("indices.get_alias.keys") { indexes }

spec/validators/url_validator_spec.rb

@@ -16,31 +16,31 @@
         allow_any_instance_of(UrlValidator).to receive(:valid_path?).and_call_original
       end
 
-      EXPECTED_ERROR_MESSAGE = "Please enter a valid url".freeze
+      expected_error_message = "Please enter a valid url".freeze
 
       it "the field is an empty string" do
         subject.url = ""
         subject.validate
-        expect(subject.errors[:url]).to include EXPECTED_ERROR_MESSAGE
+        expect(subject.errors[:url]).to include expected_error_message
       end
 
       it "the url does not exist" do
         subject.validate
-        expect(subject.errors[:url]).to include EXPECTED_ERROR_MESSAGE
+        expect(subject.errors[:url]).to include expected_error_message
       end
 
       it "the url does not start with 'http' or 'https' or 'ftp'" do
         subject.url = "google.com"
         subject.validate
-        expect(subject.errors[:url]).to include EXPECTED_ERROR_MESSAGE
+        expect(subject.errors[:url]).to include expected_error_message
       end
 
       it "the url path does not exist" do
         url = "http://thispathdoesnotexist.com/data"
         stub_request(:any, url).to_return(status: 404)
         subject.url = url
         subject.validate
-        expect(subject.errors[:url]).to include EXPECTED_ERROR_MESSAGE
+        expect(subject.errors[:url]).to include expected_error_message
       end
 
       it "the host does not exists" do
@@ -49,7 +49,7 @@
         stub_request(:any, url).to_raise(SocketError)
         subject.url = url
         subject.validate
-        expect(subject.errors[:url]).to include EXPECTED_ERROR_MESSAGE
+        expect(subject.errors[:url]).to include expected_error_message
       end
 
       it "the host refuses the connection" do
@@ -58,7 +58,7 @@
         stub_request(:any, url).to_raise(Errno::ECONNREFUSED)
         subject.url = url
         subject.validate
-        expect(subject.errors[:url]).to include EXPECTED_ERROR_MESSAGE
+        expect(subject.errors[:url]).to include expected_error_message
       end
     end