Merge aaa6f85 into 9955f15

.github/workflows/rspec.yml

@@ -16,18 +16,22 @@ jobs:
       run: |
         zypper ar https://download.opensuse.org/repositories/devel:/languages:/ruby/15.4/ ruby
         zypper --gpg-auto-import-keys --non-interactive in --no-recommends \
-               ruby2.7 ruby2.7-devel libxml2-devel libxslt-devel nodejs \
-               postgresql-devel sqlite3-devel libmariadb-devel git-core \
-               libQt5WebKit5 libQt5WebKit5-devel libQt5WebKitWidgets5 libQt5WebKitWidgets-devel \
-               xvfb-run which liberation-fonts gcc gcc-c++ make tar gzip patch timezone
+               ruby2.7 ruby2.7-devel libxml2-devel libxslt-devel nodejs wget unzip \
+               postgresql-devel sqlite3-devel libmariadb-devel git-core chromium \
+               which liberation-fonts gcc gcc-c++ make tar gzip patch timezone
         zypper clean -a
         gem.ruby2.7 install bundler -v 1.17.3
 
     - uses: actions/checkout@v2
 
+    - name: Install chromedriver
+      run: |
+        wget https://chromedriver.storage.googleapis.com/107.0.5304.62/chromedriver_linux64.zip
+        unzip chromedriver_linux64.zip
+        mv chromedriver /usr/bin/chromedriver
+        chmod +x /usr/bin/chromedriver
+
     - name: Install ruby dependencies
-      env:
-        QMAKE: /usr/bin/qmake-qt5
       run: bundler.ruby2.7 _1.17.3_ install
 
     - name: Set up the environment
@@ -40,7 +44,7 @@ jobs:
       run: bundler.ruby2.7 _1.17.3_ exec rubocop
 
     - name: Run spec
-      run: xvfb-run bundler.ruby2.7 _1.17.3_ exec rake spec
+      run: bundler.ruby2.7 _1.17.3_ exec rake spec
 
     - name: Coveralls
       uses: coverallsapp/github-action@master

Dockerfile

@@ -1,21 +1,24 @@
 FROM opensuse/leap:15.4
 
-# This includes several packages (like WebKit, xvfb or liberation-fonts)
+# This includes several packages (like Chromium, xvfb or liberation-fonts)
 # That are only needed to run the automated tests and wouldn't be relevant
 # in a production environment.
 RUN zypper ar https://download.opensuse.org/repositories/devel:/languages:/ruby/15.4/ ruby && \
-  zypper --gpg-auto-import-keys --non-interactive in --no-recommends \
-  ruby2.7 ruby2.7-devel libxml2-devel libxslt-devel \
-  postgresql-devel sqlite3-devel libmariadb-devel \
-  libQt5WebKit5 libQt5WebKit5-devel libQt5WebKitWidgets5 libQt5WebKitWidgets-devel \
-  xvfb-run which liberation-fonts gcc gcc-c++ make tar gzip patch timezone && \
-  zypper clean -a && \
-  gem.ruby2.7 install bundler -v 1.17.3
+    zypper --gpg-auto-import-keys --non-interactive in --no-recommends \
+           ruby2.7 ruby2.7-devel libxml2-devel libxslt-devel chromium \
+           postgresql-devel sqlite3-devel libmariadb-devel unzip wget \
+           which liberation-fonts gcc gcc-c++ make tar gzip patch timezone && \
+    zypper clean -a && \
+    gem.ruby2.7 install bundler -v 1.17.3
+
+RUN wget https://chromedriver.storage.googleapis.com/107.0.5304.62/chromedriver_linux64.zip && \
+    unzip chromedriver_linux64.zip && \
+    mv chromedriver /usr/bin/chromedriver && \
+    chmod +x /usr/bin/chromedriver
 
 RUN mkdir /app
 WORKDIR /app
 COPY . /app
-ENV QMAKE=/usr/bin/qmake-qt5
 RUN bundler.ruby2.7 _1.17.3_ install
 
 CMD ["rails", "server", "-b", "0.0.0.0"]

Gemfile

@@ -86,9 +86,9 @@ end
 group :test do
   gem 'capybara', '~> 2.0'
   gem 'capybara-email'
-  gem 'capybara-webkit'
-  gem 'database_cleaner', '~> 1.3.0'
+  gem 'database_cleaner', '~> 1.8.5'
   gem 'pdf-reader'
+  gem 'selenium-webdriver', '< 4.0'
   gem 'shoulda-matchers'
   #  gem "delorean"
 end

Gemfile.lock

@@ -63,9 +63,6 @@ GEM
     capybara-email (3.0.1)
       capybara (>= 2.4, < 4.0)
       mail
-    capybara-webkit (1.15.1)
-      capybara (>= 2.3, < 4.0)
-      json
     carrierwave (1.3.2)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
@@ -76,6 +73,7 @@ GEM
       mimemagic (~> 0.3)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
+    childprocess (3.0.0)
     clockwork (2.0.4)
       activesupport
       tzinfo
@@ -89,15 +87,9 @@ GEM
     coffee-script-source (1.12.2)
     commonjs (0.2.7)
     concurrent-ruby (1.1.8)
-    coveralls (0.8.23)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.16.1)
-      term-ansicolor (~> 1.3)
-      thor (>= 0.19.4, < 2.0)
-      tins (~> 1.6)
     crass (1.0.6)
     daemons (1.3.1)
-    database_cleaner (1.3.0)
+    database_cleaner (1.8.5)
     date_validator (0.9.0)
       activemodel
       activesupport
@@ -160,7 +152,6 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.5.1)
     kaminari (1.2.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.1)
@@ -312,6 +303,9 @@ GEM
       sprockets-rails (~> 2.0)
     sdoc (1.0.0)
       rdoc (>= 5.0)
+    selenium-webdriver (3.142.7)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)
     sexp_processor (4.13.0)
     shoulda-matchers (4.1.2)
       activesupport (>= 4.2.0)
@@ -323,9 +317,10 @@ GEM
       activemodel (> 4)
     simplecov (0.21.2)
       docile (~> 1.1)
-      simplecov_json_formatter (~> 0.1)
       simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.11.0)
+    simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     sprockets (2.12.5)
       hike (~> 1.2)
@@ -352,15 +347,12 @@ GEM
       state_machines-graphviz
       yard
     temple (0.8.2)
-    term-ansicolor (1.7.1)
-      tins (~> 1.0)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (1.4.1)
-    tins (1.22.0)
     ttfunk (1.0.3)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
@@ -395,17 +387,17 @@ DEPENDENCIES
   active_hash
   axlsx_rails
   bigdecimal (= 1.3.5)
+  bundler (< 2.0)
   byebug
   cancancan (~> 1.7)
   capybara (~> 2.0)
   capybara-email
-  capybara-webkit
   carrierwave
   clockwork
   cocoon
   coffee-rails (~> 4.0.0)
   daemons
-  database_cleaner (~> 1.3.0)
+  database_cleaner (~> 1.8.5)
   date_validator
   delayed_job_active_record
   devise
@@ -433,10 +425,12 @@ DEPENDENCIES
   ruby-graphviz
   sass-rails (~> 4.0.0)
   sdoc
+  selenium-webdriver (< 4.0)
   shoulda-matchers
   show_for
   simple_form
   simplecov
+  simplecov-lcov
   sqlite3 (~> 1.3.13)
   state_machines-activerecord
   state_machines-yard
@@ -447,3 +441,6 @@ DEPENDENCIES
   web-console (~> 2.0)
   yard (~> 0.9.0)
   yard-activerecord
+
+BUNDLED WITH
+   1.17.3

app/views/event_emails/index.html.haml

@@ -1,21 +1,20 @@
 .col-md-10.event_email_index
   %h3.pull-left Emails for #{@event.name}
   = link_to 'Compose', new_event_event_email_path, class: 'btn btn-primary pull-right'
-.col-md-11
-  %table.table.table-striped
+%table.table.table-striped
+  %tr
+    %th #
+    %th Subject
+    %th Body
+    %th Sent By
+    %th Created At
+  - @event.event_emails.reverse.each_with_index do |e,i|
     %tr
-      %th #
-      %th Subject
-      %th Body
-      %th Sent By
-      %th Created At
-    - @event.event_emails.reverse.each_with_index do |e,i|
-      %tr
-        %td #{i+1}
-        %td
-          = link_to truncate(e.subject, length: 50), event_event_email_path(@event,e)
-        %td 
-          = markdown(truncate(e.body, length: 50))
-        %td 
-          = e.user.email
-        %td #{time_tag(e.created_at)}
+      %td #{i+1}
+      %td
+        = link_to truncate(e.subject, length: 50), event_event_email_path(@event,e)
+      %td 
+        = markdown(truncate(e.body, length: 50))
+      %td 
+        = e.user.email
+      %td #{time_tag(e.created_at)}

spec/features/event_emails_spec.rb

@@ -17,7 +17,7 @@
     sign_in_as_user(users(:luke))
 
     visit event_event_emails_path(events(:party))
-    page.should have_content "Event email Emails for Death Star's destruction celebration"
+    page.should have_content "Emails for Death Star's destruction celebration"
 
     visit event_event_emails_path(events(:hoth_hackaton))
     page.should have_content 'You are not allowed to access this page'
@@ -62,7 +62,7 @@
     fill_in 'Subject', with: "Death Star's destruction celebration"
     fill_in 'event_email_body', with: "Event Death Star's destruction celebration to be conducted soon. Be ready."
 
-    page.find('.btn-primary').trigger('click')
+    page.find('.btn-primary').click
     page.should have_content 'Email Delivered'
     ActionMailer::Base.deliveries.size.should == @deliveries + 5
   end
@@ -76,7 +76,7 @@
     page.check('Submitted')
     page.should have_field('To', with: 'wedge.antilles@rebel-alliance.org')
 
-    page.find('.btn-primary').trigger('click')
+    page.find('.btn-primary').click
     page.should have_content "can't be blank"
     ActionMailer::Base.deliveries.size.should == @deliveries
   end

spec/features/reimbursement_process_spec.rb

@@ -153,9 +153,9 @@
 
     # Print the check request
     click_link 'Check Request'
-    @pdf = pdf_content
-    @pdf.should include('Payee Name')
-    @pdf.should include('Luke Skywalker')
+    pdf = pdf_content
+    pdf.should include('Payee Name')
+    pdf.should include('Luke Skywalker')
 
     # Check the acceptance
     visit request_reimbursement_acceptance_path(@reimbursement.request)
@@ -192,8 +192,8 @@
     click_link 'Log out'
     sign_in_as_user users(:wedge)
     visit request_reimbursement_acceptance_path(@reimbursement.request)
-    page.status_code.should == 403
+    page.should have_content 'You are not allowed to access this page. If you think that you should, contact your administrator.'
     visit check_request_request_reimbursement_path(@reimbursement.request)
-    page.status_code.should == 403
+    page.should have_content ''
   end
 end

spec/features/request_process_spec.rb

@@ -96,7 +96,7 @@
     # Try to update
     page.should_not have_content 'Edit'
     visit edit_travel_sponsorship_path(@request)
-    page.status_code.should == 403
+    page.should have_content 'You are not allowed to access this page. If you think that you should, contact your administrator.'
 
     # Not possible, so roll back
     visit travel_sponsorship_path(@request)

spec/features/shipment_process_spec.rb

@@ -32,7 +32,7 @@
     # Try to update
     page.should_not have_content 'Edit'
     visit edit_shipment_path(@shipment)
-    page.status_code.should == 403
+    page.should have_content 'You are not allowed to access this page. If you think that you should, contact your administrator.'
 
     # Log in as material manager
     click_link 'Log out'

spec/spec_helper.rb

@@ -21,7 +21,6 @@
 require 'capybara/rspec'
 require 'capybara/rails'
 require 'capybara/email/rspec'
-require 'capybara-webkit'
 require 'database_cleaner'
 
 ActiveRecord::Migration.maintain_test_schema!
@@ -35,7 +34,18 @@
   config.include(Shoulda::Matchers::ActiveRecord)
   config.expect_with(:rspec) { |expectations| expectations.syntax = [:should, :expect] }
 
-  Capybara.javascript_driver = :webkit
+  Capybara.register_driver :headless do |app|
+    options = Selenium::WebDriver::Chrome::Options.new
+    options.add_argument('--headless')
+    options.add_argument('--no-sandbox')
+    options.add_argument('--disable-gpu')
+
+    options.add_preference(:download, default_directory: 'tmp/downloads/', directory_upgrade: true)
+    Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
+  end
+
+  Capybara.default_driver = :headless
+  Capybara.javascript_driver = :headless
 
   # ## Mock Framework
   #
@@ -66,10 +76,6 @@
   config.order = 'random'
 
   config.before(:each) do
-    DatabaseCleaner.strategy = :transaction
-  end
-
-  config.before(:each, js: true) do
     DatabaseCleaner.strategy = :deletion
   end
 
@@ -93,4 +99,5 @@
   end
 
   config.include(::CommonHelpers)
+  config.include(::DownloadHelpers)
 end

spec/support/common_helpers.rb

@@ -189,11 +189,9 @@ def set_acceptance_file(reimbursement, filename = 'scan001.pdf')
   # Content of the pdf returned by the last request
   #
   def pdf_content
-    temp_pdf = Tempfile.new('pdf')
-    temp_pdf << page.source.force_encoding('UTF-8')
-    reader = PDF::Reader.new(temp_pdf)
+    reader = PDF::Reader.new(download_file)
     pdf_text = reader.pages.map(&:text).join("\n")
-    temp_pdf.close
+    clear_downloads
     pdf_text
   end
 end