Commit c25a863
Changed files (9)
app
views
layouts
my
user_sessions
sessions
spec
requests
scim
app/views/layouts/application.html.erb
@@ -2,7 +2,7 @@
<html lang="<%= I18n.locale %>">
<head>
<title><%= page_title %></title>
- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+ <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<%= csrf_meta_tags %>
<%= javascript_pack_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
app/views/layouts/mailer.html.erb
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style>
/* Email styles need to be inline */
</style>
app/views/my/user_sessions/_user_session.html.erb
@@ -2,14 +2,14 @@
<article class="media">
<div class="media-left">
<figure class="image is-64x64">
- <img src="https://cdnjs.cloudflare.com/ajax/libs/browser-logos/46.1.0/<%= user_session.browser.name.downcase %>/<%= user_session.browser.name.downcase %>_64x64.png" alt="<%= user_session.browser.name %>" />
+ <img src="https://cdnjs.cloudflare.com/ajax/libs/browser-logos/46.1.0/<%= user_session.browser.name.downcase %>/<%= user_session.browser.name.downcase %>_64x64.png" alt="<%= user_session.browser.name %>">
</figure>
</div>
<div class="media-content">
<div class="content">
<p>
<strong><%= user_session.ip %></strong> <small><%= user_session.browser.name %></small> <small><%= local_time_ago(user_session.accessed_at) %></small>
- <br />
+ <br>
<%= user_session.user_agent %>
</p>
</div>
app/views/sessions/show.html.erb
@@ -2,7 +2,7 @@
<nav class="navbar" role="navigation" aria-label="main navigation">
<div class="navbar-brand">
<%= link_to my_dashboard_path, class: 'navbar-item' do %>
- <img src="<%= asset_pack_path("media/images/logo.png") %>" height="28" />
+ <img src="<%= asset_pack_path("media/images/logo.png") %>" height="28">
<% end %>
<a role="button" class="navbar-burger burger" aria-label="menu" aria-expanded="false" data-target="navigation-bar">
<span aria-hidden="true"></span>
@@ -21,7 +21,7 @@
<%= link_to t(".mfa"), my_mfa_path, class: 'navbar-item' %>
<%= link_to t(".sessions"), my_sessions_path, class: 'navbar-item' %>
<%= link_to t(".audits"), my_audits_path, class: 'navbar-item' %>
- <hr class="navbar-divider" />
+ <hr class="navbar-divider">
<a class="navbar-item" href="https://github.com/saml-kit/proof/issues/new" target="_blank"><%= t('.report_an_issue') %></a>
</div>
</div>
spec/requests/scim/v2/users_spec.rb
@@ -285,6 +285,7 @@ describe '/scim/v2/users' do
before { delete "/scim/v2/users/#{other_user.to_param}", headers: headers }
specify { expect(response).to have_http_status(:no_content) }
+
specify do
get "/scim/v2/users/#{other_user.to_param}", headers: headers
expect(response).to have_http_status(:not_found)
spec/rails_helper.rb
@@ -5,7 +5,9 @@ require 'spec_helper'
ENV['RAILS_ENV'] ||= 'test'
require File.expand_path('../config/environment', __dir__)
# Prevent database truncation if the environment is production
-abort("The Rails environment is running in production mode!") if Rails.env.production?
+if Rails.env.production?
+ abort("The Rails environment is running in production mode!")
+end
require 'rspec/rails'
# Add additional requires below this line. Rails is not loaded until this point!
.ruby-version
@@ -1,1 +1,1 @@
-2.6.3
+2.6.5
Gemfile
@@ -2,7 +2,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-ruby '2.6.3'
+ruby '2.6.5'
gem 'activerecord-session_store', '~> 1.1'
gem 'audited', '~> 4.8'
@@ -12,7 +12,7 @@ gem 'browser', '~> 2.5'
gem 'dotenv', '~> 2.5'
gem 'email_validator', '~> 1.6'
gem 'flipper', '~> 0.16'
-gem 'flipper-active_record', '~> 0.16', github: 'mokhan/flipper', branch: 'rails-6'
+gem 'flipper-active_record', '~> 0.16'
gem 'flutie', '~> 2.1'
gem 'jbuilder', '~> 2.5'
gem 'jwt', '~> 2.1'
Gemfile.lock
@@ -1,79 +1,69 @@
-GIT
- remote: https://github.com/mokhan/flipper.git
- revision: 09358caf7abb135550e6b4378b98c41efff0f8ce
- branch: rails-6
- specs:
- flipper (0.16.2)
- flipper-active_record (0.16.2)
- activerecord (>= 3.2, < 7)
- flipper (~> 0.16.2)
-
GEM
remote: https://rubygems.org/
specs:
- actioncable (6.0.0)
- actionpack (= 6.0.0)
+ actioncable (6.0.1)
+ actionpack (= 6.0.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (6.0.0)
- actionpack (= 6.0.0)
- activejob (= 6.0.0)
- activerecord (= 6.0.0)
- activestorage (= 6.0.0)
- activesupport (= 6.0.0)
+ actionmailbox (6.0.1)
+ actionpack (= 6.0.1)
+ activejob (= 6.0.1)
+ activerecord (= 6.0.1)
+ activestorage (= 6.0.1)
+ activesupport (= 6.0.1)
mail (>= 2.7.1)
- actionmailer (6.0.0)
- actionpack (= 6.0.0)
- actionview (= 6.0.0)
- activejob (= 6.0.0)
+ actionmailer (6.0.1)
+ actionpack (= 6.0.1)
+ actionview (= 6.0.1)
+ activejob (= 6.0.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (6.0.0)
- actionview (= 6.0.0)
- activesupport (= 6.0.0)
+ actionpack (6.0.1)
+ actionview (= 6.0.1)
+ activesupport (= 6.0.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (6.0.0)
- actionpack (= 6.0.0)
- activerecord (= 6.0.0)
- activestorage (= 6.0.0)
- activesupport (= 6.0.0)
+ actiontext (6.0.1)
+ actionpack (= 6.0.1)
+ activerecord (= 6.0.1)
+ activestorage (= 6.0.1)
+ activesupport (= 6.0.1)
nokogiri (>= 1.8.5)
- actionview (6.0.0)
- activesupport (= 6.0.0)
+ actionview (6.0.1)
+ activesupport (= 6.0.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
- activejob (6.0.0)
- activesupport (= 6.0.0)
+ activejob (6.0.1)
+ activesupport (= 6.0.1)
globalid (>= 0.3.6)
- activemodel (6.0.0)
- activesupport (= 6.0.0)
- activerecord (6.0.0)
- activemodel (= 6.0.0)
- activesupport (= 6.0.0)
+ activemodel (6.0.1)
+ activesupport (= 6.0.1)
+ activerecord (6.0.1)
+ activemodel (= 6.0.1)
+ activesupport (= 6.0.1)
activerecord-session_store (1.1.3)
actionpack (>= 4.0)
activerecord (>= 4.0)
multi_json (~> 1.11, >= 1.11.2)
rack (>= 1.5.2, < 3)
railties (>= 4.0)
- activestorage (6.0.0)
- actionpack (= 6.0.0)
- activejob (= 6.0.0)
- activerecord (= 6.0.0)
+ activestorage (6.0.1)
+ actionpack (= 6.0.1)
+ activejob (= 6.0.1)
+ activerecord (= 6.0.1)
marcel (~> 0.3.1)
- activesupport (6.0.0)
+ activesupport (6.0.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
- zeitwerk (~> 2.1, >= 2.1.8)
- addressable (2.6.0)
- public_suffix (>= 2.0.2, < 4.0)
+ zeitwerk (~> 2.2)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
ast (2.4.0)
audited (4.9.0)
activerecord (>= 4.2, < 6.1)
@@ -87,16 +77,16 @@ GEM
parser (>= 2.4)
smart_properties
bindex (0.8.1)
- bootsnap (1.4.4)
+ bootsnap (1.4.5)
msgpack (~> 1.0)
- brakeman (4.6.1)
+ brakeman (4.7.1)
browser (2.6.1)
builder (3.2.3)
bundler-audit (0.6.1)
bundler (>= 1.2.0, < 3)
thor (~> 0.18)
byebug (11.0.1)
- capybara (3.28.0)
+ capybara (3.29.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
@@ -107,13 +97,12 @@ GEM
capybara-screenshot (1.0.23)
capybara (>= 1.0, < 4)
launchy
- childprocess (1.0.1)
- rake (< 13.0)
+ childprocess (3.0.0)
colorator (1.1.0)
concurrent-ruby (1.1.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
- crass (1.0.4)
+ crass (1.0.5)
diff-lcs (1.3)
dotenv (2.7.5)
em-websocket (0.5.1)
@@ -121,28 +110,32 @@ GEM
http_parser.rb (~> 0.6.0)
email_validator (1.6.0)
activemodel
- erb_lint (0.0.29)
+ erb_lint (0.0.30)
activesupport
better_html (~> 1.0.7)
html_tokenizer
rainbow
rubocop (~> 0.51)
smart_properties
- erubi (1.8.0)
+ erubi (1.9.0)
eventmachine (1.2.7)
factory_bot (4.11.1)
activesupport (>= 3.0.0)
factory_bot_rails (4.11.1)
factory_bot (~> 4.11.1)
railties (>= 3.0.0)
- ffaker (2.11.0)
+ ffaker (2.13.0)
ffi (1.11.1)
- flutie (2.1.0)
+ flipper (0.17.1)
+ flipper-active_record (0.17.1)
+ activerecord (>= 4.2, < 7)
+ flipper (~> 0.17.1)
+ flutie (2.2.0)
forwardable-extended (2.6.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
hashdiff (1.0.0)
- highline (2.0.2)
+ highline (2.0.3)
html_tokenizer (0.0.7)
http_parser.rb (0.6.0)
i18n (0.9.5)
@@ -157,7 +150,7 @@ GEM
rails-i18n
rainbow (>= 2.2.2, < 4.0)
terminal-table (>= 1.5.1)
- jaro_winkler (1.5.3)
+ jaro_winkler (1.5.4)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
jekyll (3.8.6)
@@ -191,7 +184,7 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
local_time (2.1.0)
- loofah (2.2.3)
+ loofah (2.3.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
@@ -207,47 +200,47 @@ GEM
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
- minitest (5.11.3)
+ minitest (5.13.0)
msgpack (1.3.1)
- multi_json (1.13.1)
- net-hippie (0.2.6)
- nio4r (2.4.0)
- nokogiri (1.10.4)
+ multi_json (1.14.1)
+ net-hippie (0.2.7)
+ nio4r (2.5.2)
+ nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
- parallel (1.17.0)
- parser (2.6.3.0)
+ parallel (1.18.0)
+ parser (2.6.5.0)
ast (~> 2.4.0)
parslet (1.8.2)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
pg (1.1.4)
- public_suffix (3.1.1)
+ public_suffix (4.0.1)
puma (3.12.1)
rack (2.0.7)
rack-proxy (0.6.5)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
- rails (6.0.0)
- actioncable (= 6.0.0)
- actionmailbox (= 6.0.0)
- actionmailer (= 6.0.0)
- actionpack (= 6.0.0)
- actiontext (= 6.0.0)
- actionview (= 6.0.0)
- activejob (= 6.0.0)
- activemodel (= 6.0.0)
- activerecord (= 6.0.0)
- activestorage (= 6.0.0)
- activesupport (= 6.0.0)
+ rails (6.0.1)
+ actioncable (= 6.0.1)
+ actionmailbox (= 6.0.1)
+ actionmailer (= 6.0.1)
+ actionpack (= 6.0.1)
+ actiontext (= 6.0.1)
+ actionview (= 6.0.1)
+ activejob (= 6.0.1)
+ activemodel (= 6.0.1)
+ activerecord (= 6.0.1)
+ activestorage (= 6.0.1)
+ activesupport (= 6.0.1)
bundler (>= 1.3.0)
- railties (= 6.0.0)
+ railties (= 6.0.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
- rails-html-sanitizer (1.2.0)
- loofah (~> 2.2, >= 2.2.2)
+ rails-html-sanitizer (1.3.0)
+ loofah (~> 2.3)
rails-i18n (6.0.0)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7)
@@ -256,52 +249,52 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
- railties (6.0.0)
- actionpack (= 6.0.0)
- activesupport (= 6.0.0)
+ railties (6.0.1)
+ actionpack (= 6.0.1)
+ activesupport (= 6.0.1)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rainbow (3.0.0)
- rake (12.3.3)
+ rake (13.0.0)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
regexp_parser (1.6.0)
rotp (3.3.1)
- rouge (3.8.0)
- rspec-core (3.8.2)
- rspec-support (~> 3.8.0)
- rspec-expectations (3.8.4)
+ rouge (3.12.0)
+ rspec-core (3.9.0)
+ rspec-support (~> 3.9.0)
+ rspec-expectations (3.9.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.8.0)
- rspec-mocks (3.8.1)
+ rspec-support (~> 3.9.0)
+ rspec-mocks (3.9.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.8.0)
- rspec-rails (3.8.2)
+ rspec-support (~> 3.9.0)
+ rspec-rails (3.9.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec-core (~> 3.8.0)
- rspec-expectations (~> 3.8.0)
- rspec-mocks (~> 3.8.0)
- rspec-support (~> 3.8.0)
- rspec-support (3.8.2)
- rubocop (0.74.0)
+ rspec-core (~> 3.9.0)
+ rspec-expectations (~> 3.9.0)
+ rspec-mocks (~> 3.9.0)
+ rspec-support (~> 3.9.0)
+ rspec-support (3.9.0)
+ rubocop (0.76.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
- rubocop-rails (2.3.0)
+ rubocop-rails (2.3.2)
rack (>= 1.1)
rubocop (>= 0.72.0)
- rubocop-rspec (1.35.0)
- rubocop (>= 0.60.0)
+ rubocop-rspec (1.36.0)
+ rubocop (>= 0.68.1)
ruby-progressbar (1.10.1)
ruby_dep (1.5.0)
- rubyzip (1.2.3)
+ rubyzip (2.0.0)
safe_yaml (1.0.5)
saml-kit (1.1.0)
activemodel (>= 4.2.0)
@@ -318,12 +311,12 @@ GEM
parslet (~> 1.8)
tilt (~> 2.0)
tilt-jbuilder (~> 0.7)
- selenium-webdriver (3.142.3)
- childprocess (>= 0.5, < 2.0)
- rubyzip (~> 1.2, >= 1.2.2)
+ selenium-webdriver (3.142.6)
+ childprocess (>= 0.5, < 4.0)
+ rubyzip (>= 1.2.2)
smart_properties (1.15.0)
spank (1.0.1441140881)
- sprockets (3.7.2)
+ sprockets (4.0.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
@@ -334,11 +327,11 @@ GEM
unicode-display_width (~> 1.1, >= 1.1.1)
thor (0.20.3)
thread_safe (0.3.6)
- tilt (2.0.9)
+ tilt (2.0.10)
tilt-jbuilder (0.7.1)
jbuilder
tilt (>= 1.3.0, < 3)
- turbolinks (5.2.0)
+ turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
@@ -351,7 +344,7 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
- webmock (3.6.2)
+ webmock (3.7.6)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
@@ -372,7 +365,7 @@ GEM
nokogiri (>= 1.6.8, < 2.0.0)
xpath (3.2.0)
nokogiri (~> 1.8)
- zeitwerk (2.1.9)
+ zeitwerk (2.2.1)
PLATFORMS
ruby
@@ -394,7 +387,7 @@ DEPENDENCIES
factory_bot_rails (~> 4.11)
ffaker (~> 2.10)
flipper (~> 0.16)
- flipper-active_record (~> 0.16)!
+ flipper-active_record (~> 0.16)
flutie (~> 2.1)
i18n-tasks (~> 0.9.24)
jbuilder (~> 2.5)
@@ -424,7 +417,7 @@ DEPENDENCIES
webpacker (~> 4.0)
RUBY VERSION
- ruby 2.6.3p62
+ ruby 2.6.5p114
BUNDLED WITH
1.17.3