Better toasts. Add pg service in travis.

This commit is contained in:
2020-08-20 12:28:05 +01:00
parent 0125eadc38
commit e77691d960
8 changed files with 149 additions and 30 deletions
+26 -15
View File
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d6389a56-ae12-4279-bc1d-76334fb6e4f6" name="Default Changelist" comment="Fix tests for admins and users - email key was missing">
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<list default="true" id="d6389a56-ae12-4279-bc1d-76334fb6e4f6" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/app/views/layouts/_toasts.html.erb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Gemfile" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/environments/test.rb" beforeDir="false" afterPath="$PROJECT_DIR$/config/environments/test.rb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.travis.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.travis.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/javascript/stylesheets/application.scss" beforeDir="false" afterPath="$PROJECT_DIR$/app/javascript/stylesheets/application.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/views/layouts/_content.html.erb" beforeDir="false" afterPath="$PROJECT_DIR$/app/views/layouts/_content.html.erb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/views/layouts/application.html.erb" beforeDir="false" afterPath="$PROJECT_DIR$/app/views/layouts/application.html.erb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ss-calculator.iml" beforeDir="false" afterPath="$PROJECT_DIR$/ss-calculator.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/fixtures/admins.yml" beforeDir="false" afterPath="$PROJECT_DIR$/test/fixtures/admins.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/fixtures/users.yml" beforeDir="false" afterPath="$PROJECT_DIR$/test/fixtures/users.yml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -52,9 +52,9 @@
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="vcs.Git" />
<property name="settings.editor.selected.configurable" value="com.leinardi.pycharm.pylint.PylintConfigurable" />
</component>
<component name="RunManager" selected="Docker.docker-compose.yml[db, web]: Compose Build">
<component name="RunManager" selected="Docker.docker-compose.yml[db, web]: Compose Deployment">
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
<option name="arquillianRunConfiguration">
<value>
@@ -125,7 +125,7 @@
<updated>1597686467739</updated>
<workItem from="1597686468787" duration="5768000" />
<workItem from="1597747634273" duration="16339000" />
<workItem from="1597855104277" duration="8356000" />
<workItem from="1597855104277" duration="10596000" />
</task>
<task id="LOCAL-00001" summary="Install rails_admin and devise. Start setting it up.">
<created>1597695591871</created>
@@ -148,7 +148,14 @@
<option name="project" value="LOCAL" />
<updated>1597917687436</updated>
</task>
<option name="localTasksCounter" value="4" />
<task id="LOCAL-00004" summary="Fix tests for admins and users - email key was missing">
<created>1597919999993</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1597919999993</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -178,10 +185,10 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="708" y="322" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597832335080" />
<state x="585" y="107" key="CommitChangelistDialog2" timestamp="1597919329274">
<state x="585" y="107" key="CommitChangelistDialog2" timestamp="1597919999422">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="585" y="107" key="CommitChangelistDialog2/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597919329274" />
<state x="585" y="107" key="CommitChangelistDialog2/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597919999422" />
<state x="798" y="388" key="DockerComposeFileDialog" timestamp="1597687575523">
<screen x="0" y="0" width="1920" height="1040" />
</state>
@@ -194,10 +201,14 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597687573558" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1597918894932">
<state x="461" y="165" key="SettingsEditor" timestamp="1597920016664">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597918894932" />
<state x="461" y="165" key="SettingsEditor/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597920016664" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1597920005606">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597920005606" />
<state x="832" y="364" key="cloudConfig.SelfSettingsDialog" timestamp="1597761380237">
<screen x="0" y="0" width="1920" height="1040" />
</state>
+3 -1
View File
@@ -2,4 +2,6 @@ language: ruby
rvm:
- 2.5
- 2.6
bundler_args: --without production
bundler_args: --without production
services:
- postgresql
-3
View File
@@ -325,8 +325,5 @@ DEPENDENCIES
webdrivers
webpacker (~> 4.0)
RUBY VERSION
ruby 2.5.8p224
BUNDLED WITH
1.17.3
@@ -3,4 +3,7 @@
body {
height: 100%;
padding-top: 5rem;
}
#toast-container {
padding-top: 3rem;
}
+1 -3
View File
@@ -1,7 +1,5 @@
<main role="main" class="container">
<div class="starter-template text-center">
<div class="text-center">
<%= yield %>
</div>
</main>
+8
View File
@@ -0,0 +1,8 @@
<% unless flash.empty? %>
<script type="text/javascript">
<% flash.each do |f| %>
<% type = f[0].to_s.gsub('alert', 'error').gsub('notice', 'info') %>
toastr['<%= type %>']('<%= f[1] %>');
<% end %>
</script>
<% end %>
+1 -8
View File
@@ -10,15 +10,8 @@
</head>
<body>
<% unless flash.empty? %>
<script type="text/javascript">
<% flash.each do |f| %>
<% type = f[0].to_s.gsub('alert', 'error').gsub('notice', 'info') %>
toastr['<%= type %>']('<%= f[1] %>');
<% end %>
</script>
<% end %>
<%= render 'layouts/toasts' %>
<%= render 'layouts/top_navigation' %>
<%= render 'layouts/content' %>
<%= render 'layouts/footer' %>
+107
View File
@@ -26,8 +26,115 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="actioncable (v6.0.3.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="actionmailbox (v6.0.3.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="actionmailer (v6.0.3.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="actionpack (v6.0.3.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="actiontext (v6.0.3.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="actionview (v6.0.3.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="activejob (v6.0.3.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="activemodel (v6.0.3.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="activemodel-serializers-xml (v1.0.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="activerecord (v6.0.3.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="activestorage (v6.0.3.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="activesupport (v6.0.3.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.7.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.15, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="bindex (v0.8.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="bootsnap (v1.4.8, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="builder (v3.2.4, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="bundler (v2.1.4, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="byebug (v11.1.3, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="capybara (v3.33.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="childprocess (v3.0.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.1.7, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="crass (v1.0.6, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="devise (v4.7.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="devise-bootstrap-views (v1.1.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="erubi (v1.9.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="faraday (v1.0.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ffi (v1.13.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="globalid (v0.4.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="haml (v5.1.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="hashie (v4.1.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="i18n (v1.8.5, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.10.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="jquery-rails (v4.4.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="jquery-ui-rails (v6.0.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="jwt (v2.2.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="kaminari (v1.2.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="kaminari-actionview (v1.2.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="kaminari-activerecord (v1.2.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="kaminari-core (v1.2.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="listen (v3.2.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="loofah (v2.6.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="mail (v2.7.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="marcel (v0.3.3, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="method_source (v1.0.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="mimemagic (v0.3.5, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="mini_mime (v1.0.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="mini_portile2 (v2.4.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="minitest (v5.14.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="msgpack (v1.3.3, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.15.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="multi_xml (v0.6.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="multipart-post (v2.1.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="nested_form (v0.3.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="nio4r (v2.5.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.10.10, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="oauth2 (v1.4.4, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="omniauth (v1.9.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="omniauth-facebook (v6.0.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="omniauth-github (v1.4.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="omniauth-google-oauth2 (v0.8.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="omniauth-oauth2 (v1.7.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="omniauth-openid (v1.0.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="orm_adapter (v0.5.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="pg (v1.2.3, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="public_suffix (v4.0.5, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="puma (v4.3.5, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack (v2.2.3, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack-openid (v1.3.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack-pjax (v1.1.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack-proxy (v0.6.5, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack-test (v1.1.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rails (v6.0.3.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v2.0.3, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.3.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rails_admin (v2.0.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="railties (v6.0.3.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rake (v13.0.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rb-fsevent (v0.10.4, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rb-inotify (v0.10.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="regexp_parser (v1.7.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="remotipart (v1.4.4, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="responders (v3.0.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ruby-openid (v2.9.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v2.3.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sass-rails (v6.0.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sassc (v2.4.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sassc-rails (v2.1.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="selenium-webdriver (v3.142.7, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="spring (v2.1.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="spring-watcher-listen (v2.0.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sprockets (v4.0.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.2.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="temple (v0.8.2, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="thor (v1.0.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.6, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.10, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="turbolinks (v5.2.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="turbolinks-source (v5.2.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.7, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="tzinfo-data (v1.2020.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="warden (v1.2.8, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="web-console (v4.0.4, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="webdrivers (v4.4.1, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="webpacker (v4.3.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="websocket-driver (v0.7.3, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="websocket-extensions (v0.1.5, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="xpath (v3.2.0, ruby-2.6.5-p114) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="zeitwerk (v2.4.0, ruby-2.6.5-p114) [gem]" level="application" />
</component>
<component name="RModuleSettingsStorage">
<LOAD_PATH number="0" />