Merge pull request #7 from schilbach/master

Continuous Integration,Tests and Deactivation of IP-Logging for Privacy

Author: naraesk

.travis.yml

@@ -0,0 +1,18 @@
+before_script:
+  - cp evaluationserver/config/database.travis.yml evaluationserver/config/database.yml
+  - "mysql -e 'create database eval_server_test;'"
+  - cd evaluationserver/
+  - bundle install
+env: 
+  - RAILS_ENV=test
+language: ruby
+rvm:
+  - 2.5.0
+script:
+  - bundle exec rails db:migrate RAILS_ENV=test
+  - bundle exec rspec
+after_failure:
+  - "mysql -e 'show databases;'"
+  - "cat ./config/database.yml"
+  - "echo $RAILS_ENV"
+  - "bundle exec rake --version"

evaluationserver/.gitignore

@@ -20,4 +20,16 @@ public/system/tests/
 *.sql
 *.log.before
 source.sh
-.env
+.env
+
+db-deployment.yaml
+db-service.yaml
+web-claim0-persistentvolumeclaim.yaml
+web-deployment.yaml
+web-env-configmap.yaml
+web-service.yaml
+coverage
+
+# Ignore encrypted secrets key file.
+config/secrets.yml.key
+config/initializers/01_env.rb

evaluationserver/.rbenv-gemsets

@@ -0,0 +1 @@
+evaluationserver

evaluationserver/.rspec

@@ -0,0 +1 @@
+--require spec_helper

evaluationserver/.ruby-version

@@ -0,0 +1 @@
+2.5.0

evaluationserver/Gemfile

@@ -57,6 +57,19 @@ group :development do
   gem 'listen'
 end
 
+group :development, :test do
+  gem 'rspec-rails'
+  gem 'factory_bot'
+  gem 'factory_bot_rails'
+  gem 'faker'
+  gem 'database_cleaner'
+  gem "i18n-tasks"
+  gem 'capybara'
+  gem 'simplecov', require: false
+  gem 'brakeman', require: false
+  gem 'capybara-screenshot', :group => :test
+end
+
 gem "font-awesome-rails"
 gem "therubyracer"
 gem "less-rails" #Sprockets (what Rails 3.1 uses for its asset pipeline) supports LESS

evaluationserver/Gemfile.lock

@@ -40,29 +40,67 @@ GEM
       tzinfo (~> 1.1)
     acts_as_list (0.9.10)
       activerecord (>= 3.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     arel (8.0.0)
+    ast (2.4.0)
     bootstrap-multiselect-rails4 (0.0.1)
       rails (>= 4.0.0)
     bootstrap-sass (3.2.0.2)
       sass (~> 3.2)
+    brakeman (4.1.1)
     builder (3.2.3)
+    capybara (2.18.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (>= 2.0, < 4.0)
+    capybara-screenshot (1.0.19)
+      capybara (>= 1.0, < 4)
+      launchy
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     cocoon (1.2.11)
     commonjs (0.2.7)
     concurrent-ruby (1.0.5)
     crass (1.0.3)
+    database_cleaner (1.6.2)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    easy_translate (0.5.1)
+      thread
+      thread_safe
     erubi (1.7.0)
     execjs (2.7.0)
+    factory_bot (4.8.2)
+      activesupport (>= 3.0.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
+      railties (>= 3.0.0)
+    faker (1.8.7)
+      i18n (>= 0.7)
     ffi (1.9.18)
     font-awesome-rails (4.7.0.2)
       railties (>= 3.2, < 5.2)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     grease (0.3.1)
+    highline (1.7.10)
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
+    i18n-tasks (0.9.21)
+      activesupport (>= 4.0.2)
+      ast (>= 2.1.0)
+      easy_translate (>= 0.5.1)
+      erubi
+      highline (>= 1.7.3)
+      i18n
+      parser (>= 2.2.3.0)
+      rainbow (>= 2.2.2, < 4.0)
+      terminal-table (>= 1.5.1)
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
@@ -71,6 +109,8 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.6)
+    launchy (2.4.3)
+      addressable (~> 2.3)
     less (2.6.0)
       commonjs (~> 0.2.7)
     less-rails (3.0.0)
@@ -110,6 +150,9 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
+    parser (2.5.0.5)
+      ast (~> 2.4.0)
+    public_suffix (3.0.2)
     puma (3.11.0)
     rack (2.0.3)
     rack-test (0.8.2)
@@ -138,6 +181,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (3.0.0)
     rake (12.3.0)
     ranked-model (0.4.0)
       activerecord (>= 3.1.12)
@@ -146,6 +190,23 @@ GEM
       ffi (>= 0.5.0, < 2)
     rdoc (4.3.0)
     ref (2.0.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     ruby_dep (1.5.0)
     rubyzip (1.2.1)
     sass (3.5.4)
@@ -162,17 +223,25 @@ GEM
     sdoc (0.4.2)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    simplecov (0.15.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
     thor (0.20.0)
+    thread (0.2.2)
     thread_safe (0.3.6)
     tilt (2.0.8)
     tinymce-rails (4.7.4)
@@ -184,9 +253,12 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.1.2)
       execjs (>= 0.3.0, < 3)
+    unicode-display_width (1.3.0)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
+    xpath (3.0.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -196,8 +268,16 @@ DEPENDENCIES
   acts_as_list
   bootstrap-multiselect-rails4
   bootstrap-sass (~> 3.2.0)
+  brakeman
+  capybara
+  capybara-screenshot
   cocoon
+  database_cleaner
+  factory_bot
+  factory_bot_rails
+  faker
   font-awesome-rails
+  i18n-tasks
   jbuilder
   jquery-rails
   less-rails
@@ -210,13 +290,15 @@ DEPENDENCIES
   rails
   rails_serve_static_assets
   ranked-model
+  rspec-rails
   rubyzip
   sass-rails
   sdoc
+  simplecov
   therubyracer
   tinymce-rails
   turbolinks
   uglifier
 
 BUNDLED WITH
-   1.15.1
+   1.16.1

evaluationserver/app/controllers/administration_controller.rb

@@ -1,11 +1,13 @@
 class AdministrationController < ApplicationController
 
   def admin_mode_on
+    #request.session_options[:skip] = false
     session[:admin] = true
     redirect_back(fallback_location: root_path)
   end
 
   def admin_mode_off
+    #request.session_options[:skip] = false
     session.delete(:admin)
     redirect_back(fallback_location: root_path)
   end

evaluationserver/app/controllers/application_controller.rb

@@ -2,7 +2,7 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
-
+  
   before_action :set_cache_headers
 
   CREDENTIALS = {
@@ -44,9 +44,10 @@ def http_basic_authenticate
 
 
   def set_cache_headers
-    response.headers["Cache-Control"] = "no-cache, no-store"
-    response.headers["Pragma"] = "no-cache"
-    response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
+    #response.headers["Cache-Control"] = "no-cache, no-store"
+    #response.headers["Pragma"] = "no-cache"
+    #response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
+    #request.session_options[:skip] = true unless session[:admin]
   end
 
 end

evaluationserver/app/controllers/experiments_controller.rb

@@ -80,6 +80,12 @@ def start
   end
 
   def conduct
+    if @participant_experiment_step.nil?
+      render :layout => 'blank', :status => :error, :text => 'No such step'
+      return
+    end
+
+    
     unless @participant_experiment_step.experiment_step.step.scenes.empty?
 
 
@@ -138,16 +144,6 @@ def import
 
   end
 
-  def upload
-    uploaded_io = params[:experiment_xml]
-    xml_string = uploaded_io.read
-    the_experiment = Experiment.create_from_xml(xml_string)
-    if the_experiment
-      redirect_to experiment_path(the_experiment)
-    end
-  end
-
-
   def already_done
     ### TODO: Möglichkeit zum Fortsetzen schaffen
     render :layout => 'blank'