master <- develop (2.1.3) (#489)

* fix(questionnaire): missing information now in correct place (#443)

* fix(questionnair): missing information now in correct place

it now displays the correct message "Please read & accept" instead of
missing information and the notification is now in the correct place

* Update app/assets/javascripts/validate.js

* Revert "Update app/assets/javascripts/validate.js"

This reverts commit bc54783.

Signed-off-by: Peter Kos <[email protected]>

Co-authored-by: Peter Kos <[email protected]>

* fix: Fixes mobile agreements layout bug

Signed-off-by: Peter Kos <[email protected]>

* feat: Removes semantic-release (#446)

* refactor: Moves CI to develop branch (#449)

Co-authored-by: Peter Kos <[email protected]>

* build: Merges 2.1.2 into develop

* fix(hakiri): corrected unescaped model attribute

* fix(hakiri): added html_safe to show proper output

Co-authored-by: Jeremy Rudman <[email protected]>
Co-authored-by: JeremyRudman <[email protected]>

* fix: Shows questionnaires_closed_message on registration

* feat: Allows agreements to be fully customizable (#465)

* feat: Allows agreements to be fully customizable

* fix: Fixes broken migrations

* fix: Migrations misname issue

* feat: Forces agreement links to open in new tab

* Agreement validation detection fixed

Signed-off-by: Peter Kos <[email protected]>

* refactor: Removes old input hint

Co-authored-by: Peter Kos <[email protected]>

* fix(hakiri): fixed un-escaped regex for vcs link (#467)

* fix(hakiri): corrected unescaped model attribute

* fix(hakiri): added html_safe to show proper output

* fix(hakiri): added \A \z to regex

* fix(questionnaire): fixed hakiri error with vcs link regex

* fix(questionnaire): fixed houndci commplaint

Co-authored-by: Chris Baudouin, Jr <[email protected]>

* fix(hakiri): fix hakiri error with user input in html_safe (#475)

Co-authored-by: Peter Kos <[email protected]>

* fix: Uninstalls deprecated chromedriver (#484)

* fix: VCS regex matches all valid usernames for each provider; URLs are now case-insensitive, dokku check extended (#485)

* fixed vcs regex to allow upper case

added a extra test to vcs links to test upper case links. also made it
so portfolio links ands vcs links are stored in lower case

* fixed houndci complaints

* lossened username regex and add another test

* made regex more pleasing to read

* made regex method more readable

* checks now does 300 attempts

Co-authored-by: JeremyRudman <[email protected]>
Co-authored-by: Chris Baudouin, Jr <[email protected]>
Co-authored-by: Jeremy Rudman <[email protected]>

Author: 3 people

CHECKS

@@ -1,4 +1,4 @@
 WAIT=10
-ATTEMPTS=20
+ATTEMPTS=300
 
 /users/sign_in  Sign in to

Gemfile

@@ -124,8 +124,6 @@ group :test do
   # Adds support for Capybara system testing and selenium driver
   gem 'capybara', '>= 2.15'
   gem 'selenium-webdriver'
-  # Easy installation and use of chromedriver to run system tests with Chrome
-  gem 'chromedriver-helper'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -48,8 +48,6 @@ GEM
       railties (>= 5.0)
       zeitwerk
     ansi (1.5.0)
-    archive-zip (0.12.0)
-      io-like (~> 0.3.0)
     arel (9.0.0)
     audited (4.9.0)
       activerecord (>= 4.2, < 6.1)
@@ -102,9 +100,6 @@ GEM
       xpath (~> 3.2)
     chartkick (3.4.0)
     childprocess (3.0.0)
-    chromedriver-helper (2.1.1)
-      archive-zip (~> 0.10)
-      nokogiri (~> 1.8)
     codeclimate-test-reporter (0.6.0)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.3)
@@ -197,7 +192,6 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    io-like (0.3.1)
     jmespath (1.4.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
@@ -449,7 +443,6 @@ DEPENDENCIES
   byebug
   capybara (>= 2.15)
   chartkick (~> 3.4)
-  chromedriver-helper
   codeclimate-test-reporter (~> 0.6.0)
   devise (~> 4.7)
   devise-doorkeeper

app/models/questionnaire.rb

@@ -43,7 +43,10 @@ class Questionnaire < ApplicationRecord
 
   validates :portfolio_url, url: { allow_blank: true }
   validates :vcs_url, url: { allow_blank: true }
-  validates_format_of :vcs_url, with: %r{\A(((https?:\/\/)?(www\.)?github\.com\/\w+\/?)|((https?:\/\/)?(www\.)?gitlab\.com\/\w+\/?)|((https?:\/\/)?(www\.)?bitbucket\.org\/\w+\/?))\z}, allow_blank: true, message: "Must be a GitHub, GitLab or Bitbucket url"
+  validates_format_of :vcs_url,
+                      with: %r{\A((https?:\/\/)?(www\.)?((github\.com)|(gitlab\.com)|(bitbucket\.org))\/(.*){0,62})\z}i,
+                      allow_blank: true,
+                      message: "Must be a GitHub, GitLab or Bitbucket url"
   strip_attributes
 
   POSSIBLE_EXPERIENCES = {
@@ -129,11 +132,13 @@ def email
   end
 
   def portfolio_url=(value)
+    value = value.downcase unless value.blank?
     value = "http://" + value if !value.blank? && !value.include?("http://") && !value.include?("https://")
     super value
   end
 
   def vcs_url=(value)
+    value = value.downcase unless value.blank?
     value = "https://" + value if !value.blank? && !value.include?("http://") && !value.include?("https://")
     super value
   end

test/models/questionnaire_test.rb

@@ -103,6 +103,8 @@ class QuestionnaireTest < ActiveSupport::TestCase
   should allow_value('foo.com').for(:portfolio_url)
   should allow_value('github.com/foo', 'gitlab.com/bar', 'bitbucket.org/baz').for(:vcs_url)
   should allow_value('https://github.com/foo', 'https://gitlab.com/bar', 'https://bitbucket.org/baz').for(:vcs_url)
+  should allow_value('HttPs://gITHub.CoM/foo', 'hTTp://gitLAB.coM/bar').for(:vcs_url)
+  should allow_value('wWw.gITHub.CoM/fOo', 'hTTp://wWw.gitLAB.coM/f-fc-vx').for(:vcs_url)
   should_not allow_value('http://foo.com', 'https://bar.com').for(:vcs_url)
 
   context "#school" do