Skip to content

Commit 1b74ef9

Browse files
author
Aaron Hicks
committed
Update tests
1 parent a9b7d52 commit 1b74ef9

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

spec/classes/app_install_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
'provider' => 'git',
2222
'user' => 'git',
2323
'source' => 'https://gitlab.com/gitlab-org/gitlab-ce.git',
24-
'revision' => '7-1-stable',
24+
'revision' => '7-3-stable',
2525
'require' => 'User[gitlab]'
2626
) }
2727
it { should contain_file('gitlab_app_dir').with(

spec/classes/init_spec.rb

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
'user' => 'git',
5555
'user_home' => '/home/git',
5656
'repository' => 'https://gitlab.com/gitlab-org/gitlab-shell.git',
57-
'revision' => 'v1.9.6',
57+
'revision' => 'v2.0.0',
5858
'repository_dir' => '/home/git/repositories',
5959
'auth_file' => '/home/git/.ssh/authorized_keys',
6060
'selfsigned_certs' => true,
@@ -73,7 +73,7 @@
7373
it { should contain_class('gitlab::install').with(
7474
'app_dir' => '/home/git/gitlab',
7575
'repository' => 'https://gitlab.com/gitlab-org/gitlab-ce.git',
76-
'revision' => '7-1-stable',
76+
'revision' => '7-3-stable',
7777
'user' => 'git'
7878
) }
7979
it { should contain_file('gitlab_app_config').with(
@@ -167,7 +167,7 @@
167167
{'error_code' => '503', 'document' => '/deploy.html'}
168168
],
169169
'error_log_file' => 'gitlab.test.example.org.log',
170-
'custom_fragment' => " CustomLog /var/log/apache2/gitlab_test.example.org_forwarded.log common_forwarded\n CustomLog /var/log/apache2/gitlab_test.example.org_access.log combined env=!dontlog\n CustomLog /var/log/apache2/gitlab_test.example.org.log combined",
170+
'custom_fragment' => " CustomLog /var/log/apache2/gitlab_test.example.org_forwarded.log common_forwarded\n CustomLog /var/log/apache2/gitlab_test.example.org_access.log combined env=!dontlog\n CustomLog /var/log/apache2/gitlab_test.example.org.log combined\n AllowEncodedSlashes NoDecode",
171171
'require' => ['Ruby::Rake[gitlab_precompile_assets]','Service[gitlab]']
172172
) }
173173
# Verify contents of gitlab_app_config
@@ -527,6 +527,8 @@
527527
'servername' => 'git.somewhere.org',
528528
'docroot' => '/home/git/gitlab/public',
529529
'serveradmin' => 'admin@somewhere.org',
530+
'docroot_owner' => 'git',
531+
'docroot_group' => 'git',
530532
'port' => '80',
531533
'directories' => {},
532534
'rewrites' => [
@@ -560,7 +562,7 @@
560562
{'error_code' => '503', 'document' => '/deploy.html'}
561563
],
562564
'error_log_file' => 'gitlab.git.somewhere.org.log',
563-
'custom_fragment' => " CustomLog /var/log/apache2/gitlab_git.somewhere.org_forwarded.log common_forwarded\n CustomLog /var/log/apache2/gitlab_git.somewhere.org_access.log combined env=!dontlog\n CustomLog /var/log/apache2/gitlab_git.somewhere.org.log combined",
565+
'custom_fragment' => " CustomLog /var/log/apache2/gitlab_git.somewhere.org_forwarded.log common_forwarded\n CustomLog /var/log/apache2/gitlab_git.somewhere.org_access.log combined env=!dontlog\n CustomLog /var/log/apache2/gitlab_git.somewhere.org.log combined\n AllowEncodedSlashes NoDecode",
564566
'require' => ['Ruby::Rake[gitlab_precompile_assets]','Service[gitlab]']
565567
) }
566568
it { should contain_file('gitlab_app_config').with_content(
@@ -653,6 +655,7 @@
653655
describe 'when setting GitHub as an OmniAuth provider' do
654656
let :params do
655657
{
658+
:enable_https => true,
656659
:omniauth => [
657660
{ 'provider' => 'github',
658661
'app_id' => 'YOURIDHERE',
@@ -680,6 +683,7 @@
680683
describe 'when setting Twitter as an OmniAuth provider' do
681684
let :params do
682685
{
686+
:enable_https => true,
683687
:omniauth => [
684688
{ 'provider' => 'twitter',
685689
'app_id' => 'YOURIDHERE',
@@ -704,6 +708,7 @@
704708
describe 'when setting Google as an OmniAuth provider' do
705709
let :params do
706710
{
711+
:enable_https => true,
707712
:omniauth => [
708713
{ 'provider' => 'google',
709714
'app_id' => 'YOURIDHERE',
@@ -731,6 +736,7 @@
731736
describe 'when setting multiple OmniAuth providers' do
732737
let :params do
733738
{
739+
:enable_https => true,
734740
:omniauth => [
735741
{ 'provider' => 'google',
736742
'app_id' => 'YOURGOOGLEIDHERE',

spec/classes/shell_install_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
'provider' => 'git',
2222
'user' => 'git',
2323
'source' => 'https://gitlab.com/gitlab-org/gitlab-shell.git',
24-
'revision' => 'v1.9.6',
24+
'revision' => 'v2.0.0',
2525
'require' => 'User[gitlab]'
2626
) }
2727
it { should contain_file('gitlab-shell-config').with(

0 commit comments

Comments
 (0)