aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--Gemfile41
-rw-r--r--Gemfile.lock59
-rw-r--r--test/tc_mauve_authentication.rb2
-rw-r--r--test/tc_mauve_database_peculiarities.rb2
5 files changed, 28 insertions, 82 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9774d4a..119759c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,9 +9,9 @@ test:jessie: &test
variables:
DISTRO: jessie
before_script:
- - apt-get install libxml2-dev libxslt1-dev libpq-dev postgresql-server-dev-9.4 libsqlite3-dev rake
+ - apt-get install libxml2-dev libxslt1-dev libpq-dev postgresql-server-dev-9.4 libsqlite3-dev rake ruby-log4r ruby-ipaddress ruby-json ruby-sanitize ruby-rubymail thin ruby-haml ruby-haml-contrib ruby-redcloth ruby-rack ruby-rack-protection ruby-rack-flash3 ruby-tilt ruby-sinatra ruby-locale ruby-rack-test ruby-webmock ruby-timecop ruby-test-unit
script:
- - bundle install -j $(nproc) --path vendor/bundle --binstubs
+ - bundle install -j $(nproc) --path vendor/bundle --without development,test
- bundle exec rake test
test:stretch:
@@ -19,7 +19,7 @@ test:stretch:
variables:
DISTRO: stretch
before_script:
- - apt-get install libxml2-dev libxslt1-dev libpq-dev postgresql-server-dev-9.6 libsqlite3-dev rake
+ - apt-get install libxml2-dev libxslt1-dev libpq-dev postgresql-server-dev-9.6 libsqlite3-dev rake ruby-log4r ruby-ipaddress ruby-json ruby-sanitize ruby-rubymail thin ruby-haml ruby-haml-contrib ruby-redcloth ruby-rack ruby-rack-protection ruby-rack-flash3 ruby-tilt ruby-sinatra ruby-locale ruby-rack-test ruby-webmock ruby-timecop ruby-test-unit
package:jessie: &package
image: $CI_REGISTRY/docker-images/layers:$DISTRO-deb
diff --git a/Gemfile b/Gemfile
index 5af4b41..6343365 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,7 @@
source "https://rubygems.org"
-
gem "bcrypt-ruby", "= 3.1.5"
-gem "log4r", "= 1.1.10"
-gem "ipaddress", "= 0.8.0"
gem "ruby_protobuf", "= 0.4.11"
-gem "json", "= 1.8.1"
gem "datamapper"
gem "dm-aggregates"
gem "dm-do-adapter"
@@ -15,22 +11,29 @@ gem "dm-sqlite-adapter"
gem "dm-transactions"
gem "dm-types"
gem "dm-validations"
-gem "sanitize", "= 2.1.0"
-gem "rmail", "= 1.1.0"
-gem "thin", "= 1.6.3"
-gem "haml", "= 4.0.5"
-gem "haml-contrib"
-gem "RedCloth", "= 4.2.9"
-gem "rack", "= 1.5.2"
-gem "rack-protection", "= 1.5.2"
-gem "rack-flash3", "= 1.0.5"
-gem "tilt", "= 1.4.1"
-gem "sinatra", "~> 1.4.5"
-gem "locale", "= 2.1.0"
+
+group :devlopment do
+ gem "log4r"
+ gem "ipaddress"
+ gem "ruby_protobuf"
+ gem "json"
+ gem "sanitize"
+ gem "rmail"
+ gem "thin"
+ gem "haml"
+ gem "haml-contrib"
+ gem "RedCloth"
+ gem "rack"
+ gem "rack-protection"
+ gem "rack-flash3"
+ gem "tilt"
+ gem "sinatra"
+ gem "locale"
+end
group :test do
gem "simplecov", :require => false
- gem "rack-test", "= 0.6.3"
- gem "webmock", "= 1.19.0"
- gem "timecop", "= 0.7.1"
+ gem "rack-test"
+ gem "webmock"
+ gem "timecop"
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 165fef9..3ec1459 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,15 +1,11 @@
GEM
remote: https://rubygems.org/
specs:
- RedCloth (4.2.9)
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
bcrypt (3.1.11)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
- crack (0.4.3)
- safe_yaml (~> 1.0.0)
- daemons (1.2.4)
data_objects (0.10.17)
addressable (~> 2.1)
datamapper (1.2.0)
@@ -64,60 +60,24 @@ GEM
do_sqlite3 (0.10.17)
data_objects (= 0.10.17)
docile (1.1.5)
- eventmachine (1.2.3)
fastercsv (1.5.5)
- haml (4.0.5)
- tilt
- haml-contrib (1.0.0.1)
- haml (>= 3.2.0.alpha.13)
- ipaddress (0.8.0)
- json (1.8.1)
+ json (1.8.6)
json_pure (1.8.6)
- locale (2.1.0)
- log4r (1.1.10)
- mini_portile2 (2.1.0)
multi_json (1.12.1)
- nokogiri (1.7.1)
- mini_portile2 (~> 2.1.0)
public_suffix (2.0.5)
- rack (1.5.2)
- rack-flash3 (1.0.5)
- rack
- rack-protection (1.5.2)
- rack
- rack-test (0.6.3)
- rack (>= 1.0)
- rmail (1.1.0)
ruby_protobuf (0.4.11)
- safe_yaml (1.0.4)
- sanitize (2.1.0)
- nokogiri (>= 1.4.4)
simplecov (0.14.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
- sinatra (1.4.8)
- rack (~> 1.5)
- rack-protection (~> 1.4)
- tilt (>= 1.3, < 3)
stringex (1.5.1)
- thin (1.6.3)
- daemons (~> 1.0, >= 1.0.9)
- eventmachine (~> 1.0)
- rack (~> 1.0)
- tilt (1.4.1)
- timecop (0.7.1)
uuidtools (2.1.5)
- webmock (1.19.0)
- addressable (>= 2.3.6)
- crack (>= 0.3.2)
PLATFORMS
ruby
DEPENDENCIES
- RedCloth (= 4.2.9)
bcrypt-ruby (= 3.1.5)
datamapper
dm-aggregates
@@ -128,22 +88,5 @@ DEPENDENCIES
dm-transactions
dm-types
dm-validations
- haml (= 4.0.5)
- haml-contrib
- ipaddress (= 0.8.0)
- json (= 1.8.1)
- locale (= 2.1.0)
- log4r (= 1.1.10)
- rack (= 1.5.2)
- rack-flash3 (= 1.0.5)
- rack-protection (= 1.5.2)
- rack-test (= 0.6.3)
- rmail (= 1.1.0)
ruby_protobuf (= 0.4.11)
- sanitize (= 2.1.0)
simplecov
- sinatra (~> 1.4.5)
- thin (= 1.6.3)
- tilt (= 1.4.1)
- timecop (= 0.7.1)
- webmock (= 1.19.0)
diff --git a/test/tc_mauve_authentication.rb b/test/tc_mauve_authentication.rb
index a770bc9..0f1a158 100644
--- a/test/tc_mauve_authentication.rb
+++ b/test/tc_mauve_authentication.rb
@@ -67,7 +67,7 @@ EOF
end
- def test_local_auth
+ def test_local_auth_again
config=<<EOF
failed_login_delay 0
diff --git a/test/tc_mauve_database_peculiarities.rb b/test/tc_mauve_database_peculiarities.rb
index 78459e2..9c20faa 100644
--- a/test/tc_mauve_database_peculiarities.rb
+++ b/test/tc_mauve_database_peculiarities.rb
@@ -69,7 +69,7 @@ class TcMauveDatabasePostgresPeculiarities < TcMauveDatabasePeculiarities
unless $?.success?
msg = "Skipping postgres tests, as DB creation (#{@temp_db}) failed."
@temp_db = nil
- skip(msg)
+ omit(msg)
end
# @pg_conn = PGconn.open(:dbname => @temp_db)
@db_url = "postgres:///#{@temp_db}"
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-12 22:39:42 +0000