appmap 0.36.0 → 0.39.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.dockerignore +1 -1
- data/.gitignore +2 -1
- data/.rubocop.yml +15 -1
- data/.travis.yml +2 -23
- data/CHANGELOG.md +20 -0
- data/README.md +30 -13
- data/Rakefile +4 -3
- data/appmap.gemspec +1 -0
- data/lib/appmap.rb +2 -2
- data/lib/appmap/class_map.rb +19 -5
- data/lib/appmap/config.rb +22 -10
- data/lib/appmap/event.rb +16 -1
- data/lib/appmap/hook.rb +11 -3
- data/lib/appmap/hook/method.rb +18 -12
- data/lib/appmap/rails/request_handler.rb +20 -4
- data/lib/appmap/rspec.rb +1 -1
- data/lib/appmap/trace.rb +18 -7
- data/lib/appmap/version.rb +2 -2
- data/spec/abstract_controller_base_spec.rb +132 -67
- data/spec/class_map_spec.rb +36 -0
- data/spec/fixtures/hook/instance_method.rb +4 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/.dockerignore +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/.gitignore +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/.rspec +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/.ruby-version +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/Dockerfile +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/Dockerfile.pg +0 -0
- data/spec/fixtures/rails5_users_app/Gemfile +51 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/Rakefile +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/app/controllers/api/users_controller.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/app/controllers/application_controller.rb +0 -0
- data/spec/fixtures/{rails4_users_app/app/assets/images → rails5_users_app/app/controllers/concerns}/.keep +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/app/controllers/health_controller.rb +0 -0
- data/spec/fixtures/rails5_users_app/app/controllers/users_controller.rb +13 -0
- data/spec/fixtures/{rails4_users_app/app/models → rails5_users_app/app/models/activerecord}/user.rb +0 -0
- data/spec/fixtures/{rails4_users_app/app/controllers → rails5_users_app/app/models}/concerns/.keep +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/app/models/sequel/user.rb +0 -0
- data/spec/fixtures/{rails4_users_app → rails5_users_app}/app/views/layouts/application.html.haml +0 -0
- data/spec/fixtures/{rails4_users_app → rails5_users_app}/app/views/users/index.html.haml +0 -0
- data/spec/fixtures/rails5_users_app/appmap.yml +4 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/appmap +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/byebug +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/gli +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/htmldiff +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/ldiff +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/nokogiri +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/rackup +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/rails +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/rake +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/rspec +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/ruby-parse +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/ruby-rewrite +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/sequel +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/setup +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/sprockets +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/thor +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/bin/update +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/config.ru +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/config/application.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/config/boot.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/config/credentials.yml.enc +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/config/database.yml +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/config/environment.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/config/environments/development.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/config/environments/production.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/config/environments/test.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/config/initializers/application_controller_renderer.rb +0 -0
- data/spec/fixtures/{rails4_users_app → rails5_users_app}/config/initializers/backtrace_silencers.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/config/initializers/cors.rb +0 -0
- data/spec/fixtures/{rails4_users_app → rails5_users_app}/config/initializers/filter_parameter_logging.rb +0 -0
- data/spec/fixtures/{rails4_users_app → rails5_users_app}/config/initializers/inflections.rb +0 -0
- data/spec/fixtures/{rails4_users_app → rails5_users_app}/config/initializers/mime_types.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/config/initializers/record_button.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/config/initializers/wrap_parameters.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/config/locales/en.yml +0 -0
- data/spec/fixtures/{rails4_users_app → rails5_users_app}/config/routes.rb +1 -2
- data/spec/fixtures/{rails_users_app → rails5_users_app}/create_app +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/db/migrate/20190728211408_create_users.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/db/schema.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/docker-compose.yml +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/features/api_users.feature +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/features/support/env.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/features/support/hooks.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/features/support/steps.rb +0 -0
- data/spec/fixtures/{rails4_users_app/app/mailers → rails5_users_app/lib/tasks}/.keep +0 -0
- data/spec/fixtures/{rails4_users_app/app/models → rails5_users_app/log}/.keep +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/public/robots.txt +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/spec/controllers/users_controller_api_spec.rb +1 -1
- data/spec/fixtures/rails5_users_app/spec/controllers/users_controller_spec.rb +27 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/spec/models/user_spec.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/spec/rails_helper.rb +0 -0
- data/spec/fixtures/{rails4_users_app → rails5_users_app}/spec/spec_helper.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails5_users_app}/users_app/.gitignore +0 -0
- data/spec/fixtures/rails6_users_app/.dockerignore +1 -0
- data/spec/fixtures/rails6_users_app/.gitignore +39 -0
- data/spec/fixtures/rails6_users_app/.rspec +1 -0
- data/spec/fixtures/rails6_users_app/.ruby-version +1 -0
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/Dockerfile +3 -4
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/Dockerfile.pg +1 -1
- data/spec/fixtures/{rails_users_app → rails6_users_app}/Gemfile +1 -1
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/Rakefile +1 -1
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/app/controllers/api/users_controller.rb +1 -1
- data/spec/fixtures/rails6_users_app/app/controllers/application_controller.rb +2 -0
- data/spec/fixtures/{rails4_users_app/app/models → rails6_users_app/app/controllers}/concerns/.keep +0 -0
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/app/controllers/health_controller.rb +1 -1
- data/spec/fixtures/rails6_users_app/app/controllers/users_controller.rb +13 -0
- data/spec/fixtures/{rails_users_app → rails6_users_app}/app/models/activerecord/user.rb +0 -0
- data/spec/fixtures/{rails4_users_app/lib/assets → rails6_users_app/app/models/concerns}/.keep +0 -0
- data/spec/fixtures/rails6_users_app/app/models/sequel/user.rb +25 -0
- data/spec/fixtures/{rails_users_app → rails6_users_app}/app/views/layouts/application.html.haml +0 -0
- data/spec/fixtures/{rails_users_app → rails6_users_app}/app/views/users/index.html.haml +0 -0
- data/spec/fixtures/rails6_users_app/appmap.yml +5 -0
- data/spec/fixtures/rails6_users_app/bin/appmap +29 -0
- data/spec/fixtures/rails6_users_app/bin/byebug +29 -0
- data/spec/fixtures/rails6_users_app/bin/gli +29 -0
- data/spec/fixtures/rails6_users_app/bin/htmldiff +29 -0
- data/spec/fixtures/rails6_users_app/bin/ldiff +29 -0
- data/spec/fixtures/rails6_users_app/bin/nokogiri +29 -0
- data/spec/fixtures/rails6_users_app/bin/rackup +29 -0
- data/spec/fixtures/rails6_users_app/bin/rails +4 -0
- data/spec/fixtures/rails6_users_app/bin/rake +29 -0
- data/spec/fixtures/rails6_users_app/bin/rspec +29 -0
- data/spec/fixtures/rails6_users_app/bin/ruby-parse +29 -0
- data/spec/fixtures/rails6_users_app/bin/ruby-rewrite +29 -0
- data/spec/fixtures/rails6_users_app/bin/sequel +29 -0
- data/spec/fixtures/rails6_users_app/bin/setup +25 -0
- data/spec/fixtures/rails6_users_app/bin/sprockets +29 -0
- data/spec/fixtures/rails6_users_app/bin/thor +29 -0
- data/spec/fixtures/rails6_users_app/bin/update +25 -0
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/config.ru +2 -1
- data/spec/fixtures/rails6_users_app/config/application.rb +51 -0
- data/spec/fixtures/rails6_users_app/config/boot.rb +3 -0
- data/spec/fixtures/rails6_users_app/config/credentials.yml.enc +1 -0
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/config/database.yml +2 -2
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/config/environment.rb +1 -1
- data/spec/fixtures/rails6_users_app/config/environments/development.rb +40 -0
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/config/environments/production.rb +19 -30
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/config/environments/test.rb +5 -11
- data/spec/fixtures/rails6_users_app/config/initializers/application_controller_renderer.rb +8 -0
- data/spec/fixtures/{rails_users_app → rails6_users_app}/config/initializers/backtrace_silencers.rb +0 -0
- data/spec/fixtures/rails6_users_app/config/initializers/cors.rb +16 -0
- data/spec/fixtures/{rails_users_app → rails6_users_app}/config/initializers/filter_parameter_logging.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails6_users_app}/config/initializers/inflections.rb +0 -0
- data/spec/fixtures/{rails_users_app → rails6_users_app}/config/initializers/mime_types.rb +0 -0
- data/spec/fixtures/rails6_users_app/config/initializers/record_button.rb +3 -0
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/config/initializers/wrap_parameters.rb +1 -6
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/config/locales/en.yml +10 -0
- data/spec/fixtures/{rails_users_app → rails6_users_app}/config/routes.rb +1 -1
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/create_app +7 -3
- data/spec/fixtures/rails6_users_app/db/migrate/20190728211408_create_users.rb +9 -0
- data/spec/fixtures/rails6_users_app/db/schema.rb +23 -0
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/docker-compose.yml +3 -1
- data/spec/fixtures/rails6_users_app/features/api_users.feature +13 -0
- data/spec/fixtures/rails6_users_app/features/support/env.rb +4 -0
- data/spec/fixtures/rails6_users_app/features/support/hooks.rb +11 -0
- data/spec/fixtures/rails6_users_app/features/support/steps.rb +18 -0
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/lib/tasks/.keep +0 -0
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/log/.keep +0 -0
- data/spec/fixtures/rails6_users_app/public/robots.txt +1 -0
- data/spec/fixtures/rails6_users_app/spec/controllers/users_controller_api_spec.rb +29 -0
- data/spec/fixtures/rails6_users_app/spec/controllers/users_controller_spec.rb +27 -0
- data/spec/fixtures/rails6_users_app/spec/models/user_spec.rb +39 -0
- data/spec/fixtures/{rails4_users_app → rails6_users_app}/spec/rails_helper.rb +3 -32
- data/spec/fixtures/{rails_users_app → rails6_users_app}/spec/spec_helper.rb +0 -0
- data/spec/fixtures/{rails4_users_app → rails6_users_app/users_app}/.gitignore +8 -1
- data/spec/hook_spec.rb +102 -57
- data/spec/rails_spec_helper.rb +5 -5
- data/spec/railtie_spec.rb +31 -32
- data/spec/record_sql_rails_pg_spec.rb +62 -63
- data/spec/remote_recording_spec.rb +90 -89
- data/spec/rspec_feature_metadata_spec.rb +17 -18
- data/test/expectations/openssl_test_key_sign1.json +55 -0
- data/test/expectations/openssl_test_key_sign2.json +58 -0
- data/test/openssl_test.rb +9 -116
- metadata +163 -139
- data/spec/abstract_controller4_base_spec.rb +0 -67
- data/spec/fixtures/rails4_users_app/.rbenv-gemsets +0 -2
- data/spec/fixtures/rails4_users_app/.ruby-version +0 -1
- data/spec/fixtures/rails4_users_app/Gemfile +0 -77
- data/spec/fixtures/rails4_users_app/README.rdoc +0 -28
- data/spec/fixtures/rails4_users_app/app/assets/javascripts/application.js +0 -16
- data/spec/fixtures/rails4_users_app/app/assets/stylesheets/application.css +0 -15
- data/spec/fixtures/rails4_users_app/app/controllers/application_controller.rb +0 -5
- data/spec/fixtures/rails4_users_app/app/controllers/users_controller.rb +0 -5
- data/spec/fixtures/rails4_users_app/app/helpers/application_helper.rb +0 -2
- data/spec/fixtures/rails4_users_app/appmap.yml +0 -3
- data/spec/fixtures/rails4_users_app/bin/rails +0 -9
- data/spec/fixtures/rails4_users_app/bin/setup +0 -29
- data/spec/fixtures/rails4_users_app/bin/spring +0 -17
- data/spec/fixtures/rails4_users_app/config/application.rb +0 -26
- data/spec/fixtures/rails4_users_app/config/boot.rb +0 -3
- data/spec/fixtures/rails4_users_app/config/environments/development.rb +0 -41
- data/spec/fixtures/rails4_users_app/config/initializers/assets.rb +0 -11
- data/spec/fixtures/rails4_users_app/config/initializers/cookies_serializer.rb +0 -3
- data/spec/fixtures/rails4_users_app/config/initializers/session_store.rb +0 -3
- data/spec/fixtures/rails4_users_app/config/initializers/to_time_preserves_timezone.rb +0 -10
- data/spec/fixtures/rails4_users_app/config/secrets.yml +0 -22
- data/spec/fixtures/rails4_users_app/db/migrate/20191127112304_create_users.rb +0 -10
- data/spec/fixtures/rails4_users_app/db/schema.rb +0 -26
- data/spec/fixtures/rails4_users_app/db/seeds.rb +0 -7
- data/spec/fixtures/rails4_users_app/public/404.html +0 -67
- data/spec/fixtures/rails4_users_app/public/422.html +0 -67
- data/spec/fixtures/rails4_users_app/public/500.html +0 -66
- data/spec/fixtures/rails4_users_app/public/favicon.ico +0 -0
- data/spec/fixtures/rails4_users_app/public/robots.txt +0 -5
- data/spec/fixtures/rails4_users_app/spec/controllers/users_controller_api_spec.rb +0 -49
- data/spec/fixtures/rails4_users_app/test/fixtures/users.yml +0 -9
- data/spec/fixtures/rails_users_app/app/controllers/concerns/.keep +0 -0
- data/spec/fixtures/rails_users_app/app/controllers/users_controller.rb +0 -5
- data/spec/fixtures/rails_users_app/app/models/concerns/.keep +0 -0
- data/spec/fixtures/rails_users_app/appmap.yml +0 -3
- data/spec/fixtures/rails_users_app/lib/tasks/.keep +0 -0
- data/spec/fixtures/rails_users_app/log/.keep +0 -0
- data/spec/record_sql_rails4_pg_spec.rb +0 -76
File without changes
|
File without changes
|
@@ -0,0 +1 @@
|
|
1
|
+
# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
|
@@ -0,0 +1,29 @@
|
|
1
|
+
require 'rails_helper'
|
2
|
+
require 'rack/test'
|
3
|
+
|
4
|
+
RSpec.describe Api::UsersController, feature_group: 'Users', type: :controller, appmap: true do
|
5
|
+
describe 'POST /api/users', feature: 'Create a user' do
|
6
|
+
describe 'with required parameters' do
|
7
|
+
it 'creates a user' do
|
8
|
+
post :create, params: { login: 'alice', password: 'foobar' }
|
9
|
+
expect(response.status).to eq(201)
|
10
|
+
end
|
11
|
+
end
|
12
|
+
describe 'with a missing parameter' do
|
13
|
+
it 'reports error 422' do
|
14
|
+
post :create, params: {}
|
15
|
+
expect(response.status).to eq(422)
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
describe 'GET /api/users', feature: 'List users' do
|
20
|
+
before do
|
21
|
+
post :create, params: { login: 'alice' }
|
22
|
+
end
|
23
|
+
it 'lists the users' do
|
24
|
+
get :index, params: {}
|
25
|
+
users = JSON.parse(response.body)
|
26
|
+
expect(users.map { |r| r['login'] }).to include('alice')
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
@@ -0,0 +1,27 @@
|
|
1
|
+
require 'rails_helper'
|
2
|
+
require 'rack/test'
|
3
|
+
|
4
|
+
RSpec.describe UsersController, type: :controller do
|
5
|
+
render_views
|
6
|
+
|
7
|
+
describe 'GET /users', feature: 'Show all users' do
|
8
|
+
before do
|
9
|
+
User.create login: 'alice'
|
10
|
+
end
|
11
|
+
it 'lists the users' do
|
12
|
+
get :index
|
13
|
+
expect(response).to be_ok
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
17
|
+
describe 'GET /users/:login', feature: 'Show a user' do
|
18
|
+
before do
|
19
|
+
User.create login: 'alice'
|
20
|
+
end
|
21
|
+
|
22
|
+
it 'shows the user' do
|
23
|
+
get :show, params: { id: 'alice' }
|
24
|
+
expect(response).to be_ok
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
@@ -0,0 +1,39 @@
|
|
1
|
+
require 'rails_helper'
|
2
|
+
|
3
|
+
describe User, feature_group: 'User', appmap: true do
|
4
|
+
# TODO: appmap/rspec doesn't handle shared_examples_for 100% correctly yet.
|
5
|
+
# In my tests, only one of these two tests will be emitted as an appmap.
|
6
|
+
shared_examples_for 'creates the user' do |username|
|
7
|
+
let(:login) { username }
|
8
|
+
let(:user) { User.new(login: login) }
|
9
|
+
it "creates #{username.inspect}" do
|
10
|
+
expect(user.save(raise_on_failure: true)).to be_truthy
|
11
|
+
end
|
12
|
+
end
|
13
|
+
|
14
|
+
describe 'creation', feature: 'Create a user' do
|
15
|
+
context 'using shared_examples_for' do
|
16
|
+
# AppMap.
|
17
|
+
# context "with username 'alice'" do
|
18
|
+
# it_should_behave_like 'creates the user', 'alice'
|
19
|
+
# end
|
20
|
+
# context "with username 'bob'" do
|
21
|
+
# it_should_behave_like 'creates the user', 'bob'
|
22
|
+
# end
|
23
|
+
end
|
24
|
+
|
25
|
+
# So, instead of shared_examples_for, let's go with a simple method
|
26
|
+
# containing the assertions. The method can be called from within an example.
|
27
|
+
def save_and_verify
|
28
|
+
expect(user.save(raise_on_failure: true)).to be_truthy
|
29
|
+
end
|
30
|
+
|
31
|
+
context do
|
32
|
+
let(:login) { 'charles' }
|
33
|
+
let(:user) { User.new(login: login) }
|
34
|
+
it "creates 'charles'" do
|
35
|
+
save_and_verify
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
@@ -1,31 +1,12 @@
|
|
1
|
-
STDERR.puts "rails4_users_app rails_helper"
|
2
1
|
# This file is copied to spec/ when you run 'rails generate rspec:install'
|
3
2
|
require 'spec_helper'
|
4
3
|
ENV['RAILS_ENV'] ||= 'test'
|
5
|
-
|
6
|
-
require File.expand_path('../config/environment', __dir__)
|
7
|
-
|
4
|
+
require File.expand_path('../../config/environment', __FILE__)
|
8
5
|
# Prevent database truncation if the environment is production
|
9
6
|
abort("The Rails environment is running in production mode!") if Rails.env.production?
|
10
7
|
require 'rspec/rails'
|
11
8
|
# Add additional requires below this line. Rails is not loaded until this point!
|
12
9
|
|
13
|
-
# The issue this hack works around is discussed here
|
14
|
-
# https://github.com/rails/rails/issues/34790, with the comment that
|
15
|
-
# it won't be fixed here:
|
16
|
-
# https://github.com/rails/rails/issues/34790#issuecomment-450036849
|
17
|
-
if RUBY_VERSION >= '2.6.0'
|
18
|
-
class ActionController::TestResponse < ActionDispatch::TestResponse
|
19
|
-
def recycle!
|
20
|
-
# hack to avoid MonitorMixin double-initialize error:
|
21
|
-
@mon_mutex_owner_object_id = nil
|
22
|
-
@mon_mutex = nil
|
23
|
-
initialize
|
24
|
-
end
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
28
|
-
|
29
10
|
require 'appmap/rspec'
|
30
11
|
|
31
12
|
# Requires supporting ruby files with custom matchers and macros, etc, in
|
@@ -43,18 +24,7 @@ require 'appmap/rspec'
|
|
43
24
|
#
|
44
25
|
# Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
|
45
26
|
|
46
|
-
# Checks for pending migrations and applies them before tests are run.
|
47
|
-
# If you are not using ActiveRecord, you can remove these lines.
|
48
|
-
begin
|
49
|
-
ActiveRecord::Migration.maintain_test_schema!
|
50
|
-
rescue ActiveRecord::PendingMigrationError => e
|
51
|
-
puts e.to_s.strip
|
52
|
-
exit 1
|
53
|
-
end
|
54
27
|
RSpec.configure do |config|
|
55
|
-
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
|
56
|
-
config.fixture_path = "#{::Rails.root}/spec/fixtures"
|
57
|
-
|
58
28
|
# RSpec Rails can automatically mix in different behaviours to your tests
|
59
29
|
# based on their file location, for example enabling you to call `get` and
|
60
30
|
# `post` in specs under `spec/controllers`.
|
@@ -75,6 +45,8 @@ RSpec.configure do |config|
|
|
75
45
|
# arbitrary gems may also be filtered via:
|
76
46
|
# config.filter_gems_from_backtrace("gem name")
|
77
47
|
|
48
|
+
|
49
|
+
DatabaseCleaner.allow_remote_database_url = true
|
78
50
|
|
79
51
|
config.before(:suite) do
|
80
52
|
DatabaseCleaner.strategy = :transaction
|
@@ -91,5 +63,4 @@ RSpec.configure do |config|
|
|
91
63
|
end
|
92
64
|
}.call
|
93
65
|
end
|
94
|
-
|
95
66
|
end
|
File without changes
|
data/spec/hook_spec.rb
CHANGED
@@ -52,9 +52,9 @@ describe 'AppMap class Hooking', docker: false do
|
|
52
52
|
|
53
53
|
events = collect_events(tracer).to_yaml
|
54
54
|
|
55
|
-
expect(Diffy::Diff.new(events_yaml, events).to_s).to eq('')
|
55
|
+
expect(Diffy::Diff.new(events_yaml, events).to_s).to eq('') if events_yaml
|
56
56
|
|
57
|
-
[ config, tracer ]
|
57
|
+
[ config, tracer, events ]
|
58
58
|
end
|
59
59
|
|
60
60
|
after do
|
@@ -112,6 +112,10 @@ describe 'AppMap class Hooking', docker: false do
|
|
112
112
|
:type: function
|
113
113
|
:location: spec/fixtures/hook/instance_method.rb:8
|
114
114
|
:static: false
|
115
|
+
:source: |2
|
116
|
+
def say_default
|
117
|
+
'default'
|
118
|
+
end
|
115
119
|
YAML
|
116
120
|
end
|
117
121
|
|
@@ -177,8 +181,8 @@ describe 'AppMap class Hooking', docker: false do
|
|
177
181
|
:static: false
|
178
182
|
:parameters:
|
179
183
|
- :name: :kw
|
180
|
-
:class:
|
181
|
-
:value:
|
184
|
+
:class: String
|
185
|
+
:value: kw
|
182
186
|
:kind: :key
|
183
187
|
:receiver:
|
184
188
|
:class: InstanceMethod
|
@@ -225,6 +229,48 @@ describe 'AppMap class Hooking', docker: false do
|
|
225
229
|
end
|
226
230
|
end
|
227
231
|
|
232
|
+
it 'hooks an instance method that takes keyword arguments' do
|
233
|
+
events_yaml = <<~YAML
|
234
|
+
---
|
235
|
+
- :id: 1
|
236
|
+
:event: :call
|
237
|
+
:defined_class: InstanceMethod
|
238
|
+
:method_id: say_kws
|
239
|
+
:path: spec/fixtures/hook/instance_method.rb
|
240
|
+
:lineno: 20
|
241
|
+
:static: false
|
242
|
+
:parameters:
|
243
|
+
- :name: :args
|
244
|
+
:class: Array
|
245
|
+
:value: "[4, 5]"
|
246
|
+
:kind: :rest
|
247
|
+
- :name: :kw1
|
248
|
+
:class: String
|
249
|
+
:value: one
|
250
|
+
:kind: :keyreq
|
251
|
+
- :name: :kw2
|
252
|
+
:class: Integer
|
253
|
+
:value: '2'
|
254
|
+
:kind: :key
|
255
|
+
- :name: :kws
|
256
|
+
:class: Hash
|
257
|
+
:value: "{:kw3=>:three}"
|
258
|
+
:kind: :keyrest
|
259
|
+
:receiver:
|
260
|
+
:class: InstanceMethod
|
261
|
+
:value: Instance Method fixture
|
262
|
+
- :id: 2
|
263
|
+
:event: :return
|
264
|
+
:parent_id: 1
|
265
|
+
:return_value:
|
266
|
+
:class: String
|
267
|
+
:value: one2{:kw3=>:three}45
|
268
|
+
YAML
|
269
|
+
test_hook_behavior 'spec/fixtures/hook/instance_method.rb', events_yaml do
|
270
|
+
expect(InstanceMethod.new.say_kws(4, 5, kw1: 'one', kw2: 2, kw3: :three)).to eq('one2{:kw3=>:three}45')
|
271
|
+
end
|
272
|
+
end
|
273
|
+
|
228
274
|
it 'hooks an instance method that takes a block argument' do
|
229
275
|
events_yaml = <<~YAML
|
230
276
|
---
|
@@ -233,7 +279,7 @@ describe 'AppMap class Hooking', docker: false do
|
|
233
279
|
:defined_class: InstanceMethod
|
234
280
|
:method_id: say_block
|
235
281
|
:path: spec/fixtures/hook/instance_method.rb
|
236
|
-
:lineno:
|
282
|
+
:lineno: 24
|
237
283
|
:static: false
|
238
284
|
:parameters:
|
239
285
|
- :name: :block
|
@@ -401,7 +447,7 @@ describe 'AppMap class Hooking', docker: false do
|
|
401
447
|
|
402
448
|
# Verify the native extension works as expected
|
403
449
|
expect(AppMap::Hook.singleton_method_owner_name(say_instance_defined)).to eq('SingletonMethod')
|
404
|
-
|
450
|
+
|
405
451
|
expect(s.say_instance_defined).to eq('defined for an instance')
|
406
452
|
end
|
407
453
|
end
|
@@ -432,7 +478,7 @@ describe 'AppMap class Hooking', docker: false do
|
|
432
478
|
expect(SingletonMethod::STRUCT_TEST.say_struct_singleton).to eq('singleton for a struct')
|
433
479
|
end
|
434
480
|
end
|
435
|
-
|
481
|
+
|
436
482
|
it 'Reports exceptions' do
|
437
483
|
events_yaml = <<~YAML
|
438
484
|
---
|
@@ -471,24 +517,6 @@ describe 'AppMap class Hooking', docker: false do
|
|
471
517
|
events_yaml = <<~YAML
|
472
518
|
---
|
473
519
|
- :id: 1
|
474
|
-
:event: :call
|
475
|
-
:defined_class: NoToSMethod
|
476
|
-
:method_id: respond_to?
|
477
|
-
:path: spec/fixtures/hook/exception_method.rb
|
478
|
-
:lineno: 24
|
479
|
-
:static: false
|
480
|
-
:parameters:
|
481
|
-
- :name: :args
|
482
|
-
:class: Symbol
|
483
|
-
:value: to_s
|
484
|
-
:kind: :rest
|
485
|
-
:receiver:
|
486
|
-
:class: Class
|
487
|
-
:value: NoToSMethod
|
488
|
-
- :id: 2
|
489
|
-
:event: :return
|
490
|
-
:parent_id: 1
|
491
|
-
- :id: 3
|
492
520
|
:event: :call
|
493
521
|
:defined_class: NoToSMethod
|
494
522
|
:method_id: say_hello
|
@@ -499,9 +527,9 @@ describe 'AppMap class Hooking', docker: false do
|
|
499
527
|
:receiver:
|
500
528
|
:class: Class
|
501
529
|
:value: NoToSMethod
|
502
|
-
- :id:
|
530
|
+
- :id: 2
|
503
531
|
:event: :return
|
504
|
-
:parent_id:
|
532
|
+
:parent_id: 1
|
505
533
|
:return_value:
|
506
534
|
:class: String
|
507
535
|
:value: hello
|
@@ -519,24 +547,6 @@ describe 'AppMap class Hooking', docker: false do
|
|
519
547
|
events_yaml = <<~YAML
|
520
548
|
---
|
521
549
|
- :id: 1
|
522
|
-
:event: :call
|
523
|
-
:defined_class: NoToSMethod
|
524
|
-
:method_id: respond_to?
|
525
|
-
:path: spec/fixtures/hook/exception_method.rb
|
526
|
-
:lineno: 24
|
527
|
-
:static: false
|
528
|
-
:parameters:
|
529
|
-
- :name: :args
|
530
|
-
:class: Symbol
|
531
|
-
:value: to_s
|
532
|
-
:kind: :rest
|
533
|
-
:receiver:
|
534
|
-
:class: Class
|
535
|
-
:value: "*Error inspecting variable*"
|
536
|
-
- :id: 2
|
537
|
-
:event: :return
|
538
|
-
:parent_id: 1
|
539
|
-
- :id: 3
|
540
550
|
:event: :call
|
541
551
|
:defined_class: InspectRaises
|
542
552
|
:method_id: say_hello
|
@@ -547,9 +557,9 @@ describe 'AppMap class Hooking', docker: false do
|
|
547
557
|
:receiver:
|
548
558
|
:class: Class
|
549
559
|
:value: "*Error inspecting variable*"
|
550
|
-
- :id:
|
560
|
+
- :id: 2
|
551
561
|
:event: :return
|
552
|
-
:parent_id:
|
562
|
+
:parent_id: 1
|
553
563
|
:return_value:
|
554
564
|
:class: String
|
555
565
|
:value: hello
|
@@ -649,8 +659,8 @@ describe 'AppMap class Hooking', docker: false do
|
|
649
659
|
:static: false
|
650
660
|
:parameters:
|
651
661
|
- :name: arg
|
652
|
-
:class:
|
653
|
-
:value: string
|
662
|
+
:class: Array
|
663
|
+
:value: '["string"]'
|
654
664
|
:kind: :rest
|
655
665
|
:receiver:
|
656
666
|
:class: Digest::SHA256
|
@@ -669,8 +679,8 @@ describe 'AppMap class Hooking', docker: false do
|
|
669
679
|
:static: false
|
670
680
|
:parameters:
|
671
681
|
- :name: arg
|
672
|
-
:class:
|
673
|
-
:value: string
|
682
|
+
:class: Array
|
683
|
+
:value: '["string"]'
|
674
684
|
:kind: :rest
|
675
685
|
:receiver:
|
676
686
|
:class: Digest::SHA256
|
@@ -695,9 +705,33 @@ describe 'AppMap class Hooking', docker: false do
|
|
695
705
|
:value: 'true'
|
696
706
|
YAML
|
697
707
|
|
698
|
-
test_hook_behavior 'spec/fixtures/hook/compare.rb',
|
708
|
+
_, _, events = test_hook_behavior 'spec/fixtures/hook/compare.rb', nil do
|
699
709
|
expect(Compare.compare('string', 'string')).to be_truthy
|
700
710
|
end
|
711
|
+
secure_compare_event = YAML.load(events).find { |evt| evt[:defined_class] == 'ActiveSupport::SecurityUtils' }
|
712
|
+
secure_compare_event.delete(:lineno)
|
713
|
+
|
714
|
+
expect(Diffy::Diff.new(<<~YAML, secure_compare_event.to_yaml).to_s).to eq('')
|
715
|
+
---
|
716
|
+
:id: 2
|
717
|
+
:event: :call
|
718
|
+
:defined_class: ActiveSupport::SecurityUtils
|
719
|
+
:method_id: secure_compare
|
720
|
+
:path: lib/active_support/security_utils.rb
|
721
|
+
:static: true
|
722
|
+
:parameters:
|
723
|
+
- :name: :a
|
724
|
+
:class: String
|
725
|
+
:value: string
|
726
|
+
:kind: :req
|
727
|
+
- :name: :b
|
728
|
+
:class: String
|
729
|
+
:value: string
|
730
|
+
:kind: :req
|
731
|
+
:receiver:
|
732
|
+
:class: Module
|
733
|
+
:value: ActiveSupport::SecurityUtils
|
734
|
+
YAML
|
701
735
|
end
|
702
736
|
|
703
737
|
it 'gets labeled in the classmap' do
|
@@ -713,6 +747,10 @@ describe 'AppMap class Hooking', docker: false do
|
|
713
747
|
:type: function
|
714
748
|
:location: spec/fixtures/hook/compare.rb:4
|
715
749
|
:static: true
|
750
|
+
:source: |2
|
751
|
+
def self.compare(s1, s2)
|
752
|
+
ActiveSupport::SecurityUtils.secure_compare(s1, s2)
|
753
|
+
end
|
716
754
|
- :name: active_support
|
717
755
|
:type: package
|
718
756
|
:children:
|
@@ -729,6 +767,15 @@ describe 'AppMap class Hooking', docker: false do
|
|
729
767
|
:labels:
|
730
768
|
- security
|
731
769
|
- crypto
|
770
|
+
:comment: |
|
771
|
+
# Constant time string comparison, for variable length strings.
|
772
|
+
#
|
773
|
+
# The values are first processed by SHA256, so that we don't leak length info
|
774
|
+
# via timing attacks.
|
775
|
+
:source: |2
|
776
|
+
def secure_compare(a, b)
|
777
|
+
fixed_length_secure_compare(::Digest::SHA256.digest(a), ::Digest::SHA256.digest(b)) && a == b
|
778
|
+
end
|
732
779
|
- :name: openssl
|
733
780
|
:type: package
|
734
781
|
:children:
|
@@ -747,16 +794,14 @@ describe 'AppMap class Hooking', docker: false do
|
|
747
794
|
- crypto
|
748
795
|
YAML
|
749
796
|
|
750
|
-
|
797
|
+
_, tracer = invoke_test_file 'spec/fixtures/hook/compare.rb' do
|
751
798
|
expect(Compare.compare('string', 'string')).to be_truthy
|
752
799
|
end
|
753
800
|
cm = AppMap::Util.sanitize_paths(AppMap::ClassMap.build_from_methods(tracer.event_methods))
|
754
801
|
entry = cm[1][:children][0][:children][0][:children][0]
|
755
802
|
# Sanity check, make sure we got the right one
|
756
803
|
expect(entry[:name]).to eq('secure_compare')
|
757
|
-
|
758
|
-
entry[:location].gsub!(spec.base_dir + '/', '')
|
759
|
-
expect(Diffy::Diff.new(classmap_yaml, cm.to_yaml).to_s).to eq('')
|
804
|
+
expect(entry[:labels]).to eq(%w[security crypto])
|
760
805
|
end
|
761
806
|
end
|
762
807
|
|
@@ -768,7 +813,7 @@ describe 'AppMap class Hooking', docker: false do
|
|
768
813
|
:defined_class: InstanceMethod
|
769
814
|
:method_id: say_the_time
|
770
815
|
:path: spec/fixtures/hook/instance_method.rb
|
771
|
-
:lineno:
|
816
|
+
:lineno: 28
|
772
817
|
:static: false
|
773
818
|
:parameters: []
|
774
819
|
:receiver:
|