appmap 0.78.0 → 0.80.1

data/spec/record_sql_rails_pg_spec.rb

@@ -2,89 +2,58 @@ require 'rails_spec_helper'
 
 describe 'SQL events' do
   include_context 'Rails app pg database', 'spec/fixtures/rails6_users_app' do
-    around(:each) do |example|
-      FileUtils.rm_rf tmpdir
-      FileUtils.mkdir_p tmpdir
-      cmd = "docker-compose run --rm -e ORM_MODULE=#{orm_module} -e RAILS_ENV=test -e APPMAP=true -v #{File.absolute_path tmpdir}:/app/tmp app ./bin/rspec spec/controllers/users_controller_api_spec.rb:#{test_line_number}"
-      run_cmd cmd, chdir: fixture_dir
-
-      example.run
-    end
-
-    let(:tmpdir) { "tmp/spec/record_sql_rails_pg_spec" }
-
-    describe 'fields' do
-      let(:test_line_number) { 8 }
-      let(:appmap_json) { File.join(tmpdir, 'appmap/rspec/Api_UsersController_POST_api_users_with_required_parameters_creates_a_user.appmap.json') }
-      let(:orm_module) { 'sequel' }
-      let(:appmap) { JSON.parse(File.read(appmap_json)) }
-      describe 'on a call event' do
-        let(:event) do
-          appmap['events'].find do |event|
-            event['event'] == 'call' &&
-              event.keys.include?('sql_query')
+    def self.check_queries(cases)
+      cases.each do |test_case, query|
+        context "in #{test_case}" do
+          let(:test_case) { test_case }
+          it "captures #{query}" do
+            expect(sql_events).to include sql_query query
           end
         end
-        it 'do not include function-only fields' do
-          expect(event.keys).to_not include('defined_class')
-          expect(event.keys).to_not include('method_id')
-          expect(event.keys).to_not include('path')
-          expect(event.keys).to_not include('lineno')
-        end
       end
     end
 
-    describe 'in a Rails app' do
-      let(:appmap) { JSON.parse(File.read(appmap_json)).to_yaml }
-      context 'while creating a new record' do
-        let(:test_line_number) { 8 }
-        let(:appmap_json) { File.join(tmpdir, 'appmap/rspec/Api_UsersController_POST_api_users_with_required_parameters_creates_a_user.appmap.json') }
+    context 'with Sequel' do
+      before(:context) { run_specs 'sequel' }
 
-        context 'using Sequel ORM' do
-          let(:orm_module) { 'sequel' }
-          it 'detects the sql INSERT' do
-            expect(appmap).to include(<<-SQL_QUERY.strip)
-  sql_query:
-    sql: INSERT INTO "users" ("login") VALUES ('alice') RETURNING *
-            SQL_QUERY
-          end
-        end
-        context 'using ActiveRecord ORM' do
-          let(:orm_module) { 'activerecord' }
-          it 'detects the sql INSERT' do
-            expect(appmap).to include(<<-SQL_QUERY.strip)
-  sql_query:
-    sql: INSERT INTO "users" ("login") VALUES ($1) RETURNING "id"
-            SQL_QUERY
-          end
-        end
-      end
+      check_queries(
+        'Api_UsersController_POST_api_users_with_required_parameters_creates_a_user' =>
+          %(INSERT INTO "users" ("login") VALUES ('alice') RETURNING *),
+        'Api_UsersController_GET_api_users_lists_the_users' => %(SELECT * FROM "users")
+      )
+    end
 
-      context 'while listing records' do
-        let(:test_line_number) { 29 }
-        let(:appmap_json) { File.join(tmpdir, 'appmap/rspec/Api_UsersController_GET_api_users_lists_the_users.appmap.json') }
+    context 'with ActiveRecord' do
+      before(:context) { run_specs 'activerecord' }
 
-        context 'using Sequel ORM' do
-          let(:orm_module) { 'sequel' }
-          it 'detects the sql SELECT' do
-            expect(appmap).to include(<<-SQL_QUERY.strip)
-  sql_query:
-    sql: SELECT * FROM "users"
-            SQL_QUERY
- 
-            expect(appmap).to include('sql:')
-          end
-        end
-        context 'using ActiveRecord ORM' do
-          let(:orm_module) { 'activerecord' }
-          it 'detects the sql SELECT' do
-            expect(appmap).to include(<<-SQL_QUERY.strip)
-  sql_query:
-    sql: SELECT "users".* FROM "users"
-            SQL_QUERY
-          end
-        end
-      end
+      check_queries(
+        'Api_UsersController_POST_api_users_with_required_parameters_creates_a_user' =>
+          %(INSERT INTO "users" ("login") VALUES ($1) RETURNING "id"),
+        'Api_UsersController_GET_api_users_lists_the_users' => %(SELECT "users".* FROM "users")
+      )
+    end
+
+    def run_specs(orm_module)
+      @app.prepare_db
+      @app.run_cmd \
+        './bin/rspec spec/controllers/users_controller_api_spec.rb:8 spec/controllers/users_controller_api_spec.rb:29',
+        'ORM_MODULE' => orm_module,
+        'RAILS_ENV' => 'test',
+        'APPMAP' => 'true'
+    end
+
+    let(:appmap_json) { File.join tmpdir, "appmap/rspec/#{test_case}.appmap.json" }
+    let(:appmap) { JSON.parse(File.read(appmap_json)) }
+    let(:tmpdir) { app.tmpdir }
+    let(:sql_events) { appmap['events'].select { |ev| ev.include? 'sql_query' } }
+
+    RSpec::Matchers.define_negated_matcher :not_include, :include
+    def sql_query(query)
+      (include('sql_query' => (include 'sql' => query)))
+        .and(not_include('defined_class'))
+        .and(not_include('method_id'))
+        .and(not_include('path'))
+        .and(not_include('lineno'))
     end
   end
 end

data/spec/remote_recording_spec.rb

@@ -1,41 +1,27 @@
 require 'rails_spec_helper'
+
+require 'random-port'
+
 require 'net/http'
 require 'socket'
 
 describe 'remote recording', :order => :defined do
   include_context 'Rails app pg database', 'spec/fixtures/rails6_users_app' do
     before(:all) do
-      fixture_dir = 'spec/fixtures/rails6_users_app'
-      start_cmd = 'docker-compose up -d app'
-      run_cmd({ 'ORM_MODULE' => 'sequel', 'APPMAP' => 'true' }, start_cmd, chdir: fixture_dir)
-      Dir.chdir fixture_dir do
-        wait_for_container 'app'
-      end
+      @service_port = RandomPort::Pool::SINGLETON.acquire
+      @app.prepare_db
+      @server = @app.spawn_cmd \
+        "./bin/rails server -p #{@service_port}",
+        'ORM_MODULE' => 'sequel',
+        'APPMAP' => 'true'
 
-      port_cmd = 'docker-compose port app 3000'
-      port_out, = run_cmd port_cmd, chdir: fixture_dir
-      @service_port = port_out.strip.split(':')[1]
-
-      service_running = false
-      retry_count = 0
       uri = URI("http://localhost:#{@service_port}/health")
 
-      until service_running
-        sleep(0.25)
-        begin
-          res = Net::HTTP.start(uri.hostname, uri.port) do |http|
-            http.request(Net::HTTP::Get.new(uri))
-          end
-
-          status = res.response.code.to_i
-          service_running = true if status >= 200 && status < 300
-
-          # give up after a certain error threshold is met
-          # we don't want to wait forever if there's an unrecoverable issue
-          raise 'gave up waiting on fixture service' if (retry_count += 1) == 10
-        rescue Errno::ETIMEDOUT, Errno::ECONNRESET, EOFError
-          $stderr.print('.')
-        end
+      100.times do
+        Net::HTTP.get(uri)
+        break
+      rescue Errno::ECONNREFUSED
+        sleep 0.1
       end
     end
 
@@ -44,8 +30,10 @@ describe 'remote recording', :order => :defined do
     end
 
     after(:all) do
-      fixture_dir = 'spec/fixtures/rails6_users_app'
-      run_cmd 'docker-compose rm -fs app', chdir: fixture_dir
+      if @server
+        Process.kill 'INT', @server
+        Process.wait @server
+      end
     end
 
     let(:service_address) { URI("http://localhost:#{@service_port}") }

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ require 'appmap'
 
 RSpec.configure do |config|
   config.example_status_persistence_file_path = "tmp/rspec_failed_examples.txt"
+  config.profile_examples = true
 end
 
 # Re-run the Rails specs without re-generating the data. This is useful for efficiently enhancing and

data/spec/swagger/swagger_spec.rb

@@ -4,24 +4,9 @@ describe 'rake appmap:swagger' do
   include_context 'Rails app pg database', "spec/fixtures/rails6_users_app" unless use_existing_data?
   include_context 'rails integration test setup'
 
-  def run_spec(spec_name)
-    cmd = <<~CMD.gsub "\n", ' '
-      docker-compose run --rm -e RAILS_ENV=test -e APPMAP=true
-      -v #{File.absolute_path tmpdir}:/app/tmp app ./bin/rspec #{spec_name}
-    CMD
-    run_cmd cmd, chdir: fixture_dir
-  end
-
-  def generate_swagger
-    cmd = <<~CMD.gsub "\n", ' '
-      docker-compose run --rm -v #{File.absolute_path tmpdir}:/app/tmp app ./bin/rake appmap:swagger
-    CMD
-    run_cmd cmd, chdir: fixture_dir
-  end
-
   unless use_existing_data?
     before(:all) do
-      generate_swagger
+      @app.run_cmd './bin/rake appmap:swagger'
     end
   end
 

data/spec/util_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'appmap/util'
 
-describe AppMap::Util, docker: false do
+describe AppMap::Util do
   describe 'scenario_filename' do
     let(:subject) { AppMap::Util.method(:scenario_filename) }
     it 'leaves short names alone' do

data/test/expectations/openssl_test_key_sign2-3.1.json

@@ -26,7 +26,8 @@
         "name": "arg",
         "class": "Array",
         "value": "[e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855, the document]",
-        "kind": "rest"
+        "kind": "rest",
+        "size": 2
       }
     ],
     "receiver": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.78.0
+  version: 0.80.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.15'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +276,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: random-port
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -312,7 +326,7 @@ files:
 - ARCHITECTURE.md
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Dockerfile.appmap
+- Dockerfile.pg
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -321,6 +335,7 @@ files:
 - appmap.gemspec
 - appmap.yml
 - config-schema.yml
+- docker-compose.yml
 - examples/install.rb
 - examples/mock_webapp/Gemfile
 - examples/mock_webapp/appmap.yml
@@ -379,6 +394,7 @@ files:
 - lib/appmap/handler/eval.rb
 - lib/appmap/handler/function.rb
 - lib/appmap/handler/net_http.rb
+- lib/appmap/handler/rails/render_handler.rb
 - lib/appmap/handler/rails/request_handler.rb
 - lib/appmap/handler/rails/sql_handler.rb
 - lib/appmap/handler/rails/template.rb
@@ -421,6 +437,7 @@ files:
 - spec/fixtures/config/invalid_yaml_config.yml
 - spec/fixtures/config/missing_path_or_gem.yml
 - spec/fixtures/config/valid_config.yml
+- spec/fixtures/database.yml
 - spec/fixtures/depends/.gitignore
 - spec/fixtures/depends/app/controllers/api/api_keys_controller.rb
 - spec/fixtures/depends/app/controllers/organizations_controller.rb
@@ -463,18 +480,14 @@ files:
 - spec/fixtures/hook/user_page_scenario.appmap.json
 - spec/fixtures/rack_users_app/.dockerignore
 - spec/fixtures/rack_users_app/.gitignore
-- spec/fixtures/rack_users_app/Dockerfile
 - spec/fixtures/rack_users_app/Gemfile
 - spec/fixtures/rack_users_app/appmap.yml
 - spec/fixtures/rack_users_app/config.ru
-- spec/fixtures/rack_users_app/docker-compose.yml
 - spec/fixtures/rack_users_app/lib/app.rb
 - spec/fixtures/rails5_users_app/.dockerignore
 - spec/fixtures/rails5_users_app/.gitignore
 - spec/fixtures/rails5_users_app/.rspec
 - spec/fixtures/rails5_users_app/.ruby-version
-- spec/fixtures/rails5_users_app/Dockerfile
-- spec/fixtures/rails5_users_app/Dockerfile.pg
 - spec/fixtures/rails5_users_app/Gemfile
 - spec/fixtures/rails5_users_app/Rakefile
 - spec/fixtures/rails5_users_app/app/controllers/api/users_controller.rb
@@ -523,10 +536,8 @@ files:
 - spec/fixtures/rails5_users_app/config/initializers/wrap_parameters.rb
 - spec/fixtures/rails5_users_app/config/locales/en.yml
 - spec/fixtures/rails5_users_app/config/routes.rb
-- spec/fixtures/rails5_users_app/create_app
 - spec/fixtures/rails5_users_app/db/migrate/20190728211408_create_users.rb
 - spec/fixtures/rails5_users_app/db/schema.rb
-- spec/fixtures/rails5_users_app/docker-compose.yml
 - spec/fixtures/rails5_users_app/features/api_users.feature
 - spec/fixtures/rails5_users_app/features/support/env.rb
 - spec/fixtures/rails5_users_app/features/support/hooks.rb
@@ -543,9 +554,6 @@ files:
 - spec/fixtures/rails6_users_app/.dockerignore
 - spec/fixtures/rails6_users_app/.gitignore
 - spec/fixtures/rails6_users_app/.rspec
-- spec/fixtures/rails6_users_app/.ruby-version
-- spec/fixtures/rails6_users_app/Dockerfile
-- spec/fixtures/rails6_users_app/Dockerfile.pg
 - spec/fixtures/rails6_users_app/Gemfile
 - spec/fixtures/rails6_users_app/Rakefile
 - spec/fixtures/rails6_users_app/app/controllers/api/users_controller.rb
@@ -594,10 +602,8 @@ files:
 - spec/fixtures/rails6_users_app/config/initializers/wrap_parameters.rb
 - spec/fixtures/rails6_users_app/config/locales/en.yml
 - spec/fixtures/rails6_users_app/config/routes.rb
-- spec/fixtures/rails6_users_app/create_app
 - spec/fixtures/rails6_users_app/db/migrate/20190728211408_create_users.rb
 - spec/fixtures/rails6_users_app/db/schema.rb
-- spec/fixtures/rails6_users_app/docker-compose.yml
 - spec/fixtures/rails6_users_app/features/api_users.feature
 - spec/fixtures/rails6_users_app/features/support/env.rb
 - spec/fixtures/rails6_users_app/features/support/hooks.rb
@@ -620,9 +626,6 @@ files:
 - spec/fixtures/rails7_users_app/.gitattributes
 - spec/fixtures/rails7_users_app/.gitignore
 - spec/fixtures/rails7_users_app/.rspec
-- spec/fixtures/rails7_users_app/.ruby-version
-- spec/fixtures/rails7_users_app/Dockerfile
-- spec/fixtures/rails7_users_app/Dockerfile.pg
 - spec/fixtures/rails7_users_app/Gemfile
 - spec/fixtures/rails7_users_app/README.md
 - spec/fixtures/rails7_users_app/Rakefile
@@ -673,12 +676,10 @@ files:
 - spec/fixtures/rails7_users_app/config/puma.rb
 - spec/fixtures/rails7_users_app/config/routes.rb
 - spec/fixtures/rails7_users_app/config/storage.yml
-- spec/fixtures/rails7_users_app/create_app
 - spec/fixtures/rails7_users_app/db/migrate/20220328093141_create_instances.rb
 - spec/fixtures/rails7_users_app/db/migrate/20220328093154_create_instructors.rb
 - spec/fixtures/rails7_users_app/db/schema.rb
 - spec/fixtures/rails7_users_app/db/seeds.rb
-- spec/fixtures/rails7_users_app/docker-compose.yml
 - spec/fixtures/rails7_users_app/lib/assets/.keep
 - spec/fixtures/rails7_users_app/lib/tasks/.keep
 - spec/fixtures/rails7_users_app/log/.keep

data/Dockerfile.appmap

@@ -1,5 +0,0 @@
-FROM alpine
-ARG GEM_VERSION
-
-RUN mkdir /pkg
-COPY pkg/appmap-${GEM_VERSION}.gem /pkg/appmap.gem

data/spec/fixtures/rack_users_app/Dockerfile

@@ -1,32 +0,0 @@
-ARG GEM_VERSION
-ARG RUBY_VERSION
-
-FROM appmap:${GEM_VERSION} as appmap
-
-FROM ruby:${RUBY_VERSION}
-RUN apt-get update && apt-get install -y vim less
-
-RUN mkdir /app
-WORKDIR /app
-
-RUN gem install -N bundler
-
-COPY Gemfile .
-
-RUN bundle
-RUN bundle binstubs rack
-
-COPY . .
-
-COPY --from=appmap /pkg/appmap.gem /tmp/
-RUN gem install /tmp/appmap.gem && \
-    bundle update --local appmap && \
-    bundle binstubs appmap --force
-
-EXPOSE 9292
-
-ENV GLI_DEBUG=true
-
-ENTRYPOINT [ "./bin/appmap", "record", "-o", "tmp/appmap.json" ]
-
-HEALTHCHECK --interval=1s --retries=10 CMD curl --fail http://localhost:9292/health || exit 1

data/spec/fixtures/rack_users_app/docker-compose.yml

@@ -1,9 +0,0 @@
-version: "3"
-services:
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: rack-users-app:${RUBY_VERSION}
-    ports:
-      - "9292"

data/spec/fixtures/rails5_users_app/Dockerfile

@@ -1,29 +0,0 @@
-ARG GEM_VERSION
-ARG RUBY_VERSION
-
-FROM appmap:${GEM_VERSION} as appmap
-
-FROM ruby:${RUBY_VERSION}
-RUN apt-get update && apt-get install -y vim less
-RUN apt-get install -y postgresql-client
-
-RUN mkdir /app
-WORKDIR /app
-
-RUN gem install -N bundler
-
-COPY Gemfile .
-
-RUN bundle
-RUN bundle binstubs bundler rspec-core --force
-
-COPY . .
-
-COPY --from=appmap /pkg/appmap.gem /tmp/
-RUN gem install /tmp/appmap.gem && \
-    bundle update --local appmap && \
-    bundle binstubs appmap --force
-
-EXPOSE 3000
-
-HEALTHCHECK --interval=1s --retries=10 CMD curl --fail http://localhost:3000/health || exit 1

data/spec/fixtures/rails5_users_app/config/database.yml

@@ -1,18 +0,0 @@
-default: &default
-  host: <%= ENV['PGHOST'] || 'pg' %>
-  port: <%= ENV['PGPORT'] || 5432 %>
-  user: postgres
-  adapter: postgresql
-  encoding: unicode
-  # For details on connection pooling, see Rails configuration guide
-  # http://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-
-development:
-  <<: *default
-  database: app_development
-test:
-  <<: *default
-  database: app_test
-production:
-  <<: *default

data/spec/fixtures/rails5_users_app/create_app

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-# Just checking for a healthy container isn't enough, apparently. If
-# we don't wait here, sometimes the database is inaccessible.
-for i in {1..10}; do
-  psql -h pg -U postgres postgres -c 'select 1' >/dev/null 2>&1 && break
-  printf ' .'
-  sleep 1
-done
-echo
-out="$(psql -h pg -U postgres postgres -c 'select 1' 2>&1)"
-if [[ $? != 0 ]]; then
-   echo "Postgres didn't start in time:"
-   echo "$out"
-   exit 1
-fi
-
-# Required for migrations
-export ORM_MODULE=sequel
-
-set +e
-psql -h pg -U postgres -c "drop database if exists app_development"
-psql -h pg -U postgres -c "drop database if exists app_test"
-set -e
-
-psql -h pg -U postgres -c "create database app_development"
-psql -h pg -U postgres -c "create database app_test"
-
-env RAILS_ENV=development bundle exec rake -t db:migrate
-env RAILS_ENV=test bundle exec rake -t db:migrate
-
-echo "INSERT INTO users ( login ) VALUES ( 'admin' )  " | psql -h pg -U postgres app_development

data/spec/fixtures/rails5_users_app/docker-compose.yml

@@ -1,31 +0,0 @@
-version: "3"
-services:
-  pg:
-    build:
-      context: .
-      dockerfile: Dockerfile.pg
-    ports:
-      - "5432"
-    environment:
-      POSTGRES_HOST_AUTH_METHOD: trust
-
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: rails5-app:${RUBY_VERSION}
-    command:
-      [ "./bin/rails", "server", "-b", "0.0.0.0", "webrick" ]
-    environment:
-      RAILS_ENV:
-      ORM_MODULE:
-      PGHOST: pg
-      PGPORT: '5432'
-      DATABASE_URL: postgres://postgres@pg
-      APPMAP:
-    volumes:
-    - .:/src/app
-    ports:
-    - "3000"
-    links:
-    - pg:pg

data/spec/fixtures/rails6_users_app/.ruby-version

@@ -1 +0,0 @@
-2.6.2

data/spec/fixtures/rails6_users_app/Dockerfile

@@ -1,44 +0,0 @@
-ARG GEM_VERSION
-ARG RUBY_VERSION
-
-FROM appmap:${GEM_VERSION} as appmap
-FROM ruby:${RUBY_VERSION}
-
-SHELL ["/bin/bash", "-c"]
-
-RUN apt-get update && apt-get install -y vim less
-RUN apt-get install -y postgresql-client
-
-RUN curl -fsSL https://fnm.vercel.app/install | bash \
-    && source /root/.bashrc \
-    && fnm install --lts \
-    && echo 'fnm default $(fnm current)' >> ~/.bashrc \
-    && ln -s $(which node) /usr/local/bin/ \
-    && ln -s $(which npx) /usr/local/bin/ \
-    && npm install -g yarn \
-    && ln -s $(which yarn) /usr/local/bin/
-
-RUN mkdir /app
-WORKDIR /app
-
-RUN gem install -N bundler
-
-COPY package.json .
-
-RUN yarn install
-
-COPY Gemfile .
-
-RUN bundle
-RUN bundle binstubs bundler rspec-core --force
-
-COPY . .
-
-COPY --from=appmap /pkg/appmap.gem /tmp/
-RUN gem install /tmp/appmap.gem && \
-    bundle update --local appmap && \
-    bundle binstubs appmap --force
-
-EXPOSE 3000
-
-HEALTHCHECK --interval=1s --retries=10 CMD curl --fail http://localhost:3000/health || exit 1

data/spec/fixtures/rails6_users_app/Dockerfile.pg

@@ -1,3 +0,0 @@
-FROM postgres:10
-
-HEALTHCHECK --interval=1s --retries=10 CMD psql -U postgres -c "select 1" || exit 1

data/spec/fixtures/rails6_users_app/config/database.yml

@@ -1,18 +0,0 @@
-default: &default
-  host: <%= ENV['PGHOST'] || 'pg' %>
-  port: <%= ENV['PGPORT'] || 5432 %>
-  user: postgres
-  adapter: postgresql
-  encoding: unicode
-  # For details on connection pooling, see Rails configuration guide
-  # http://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-
-development:
-  <<: *default
-  database: app_development
-test:
-  <<: *default
-  database: app_test
-production:
-  <<: *default