Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e7f77255
Commit
e7f77255
authored
Jan 16, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tests to home page url redirect
parent
41d7be3c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+1
-0
features/admin/settings.feature
features/admin/settings.feature
+2
-2
features/steps/admin/settings.rb
features/steps/admin/settings.rb
+4
-2
No files found.
app/views/admin/application_settings/_form.html.haml
View file @
e7f77255
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
=
f
.
label
:home_page_url
,
class:
'control-label'
=
f
.
label
:home_page_url
,
class:
'control-label'
.col-sm-10
.col-sm-10
=
f
.
text_field
:home_page_url
,
class:
'form-control'
,
placeholder:
'http://company.example.com'
=
f
.
text_field
:home_page_url
,
class:
'form-control'
,
placeholder:
'http://company.example.com'
%span
.help-block
We will redirect non-logged in users to this page
.form-group
.form-group
=
f
.
label
:sign_in_text
,
class:
'control-label'
=
f
.
label
:sign_in_text
,
class:
'control-label'
.col-sm-10
.col-sm-10
...
...
features/admin/settings.feature
View file @
e7f77255
...
@@ -5,5 +5,5 @@ Feature: Admin Settings
...
@@ -5,5 +5,5 @@ Feature: Admin Settings
And
I visit admin settings page
And
I visit admin settings page
Scenario
:
Change application settings
Scenario
:
Change application settings
When
I
disable gravatar
s and save form
When
I
modify setting
s and save form
Then
I should
be see gravatar disabl
ed
Then
I should
see application settings sav
ed
features/steps/admin/settings.rb
View file @
e7f77255
...
@@ -4,13 +4,15 @@ class Spinach::Features::AdminSettings < Spinach::FeatureSteps
...
@@ -4,13 +4,15 @@ class Spinach::Features::AdminSettings < Spinach::FeatureSteps
include
SharedAdmin
include
SharedAdmin
include
Gitlab
::
CurrentSettings
include
Gitlab
::
CurrentSettings
step
'I
disable gravatar
s and save form'
do
step
'I
modify setting
s and save form'
do
uncheck
'Gravatar enabled'
uncheck
'Gravatar enabled'
fill_in
'Home page url'
,
with:
'https://about.gitlab.com/'
click_button
'Save'
click_button
'Save'
end
end
step
'I should
be see gravatar disabl
ed'
do
step
'I should
see application settings sav
ed'
do
current_application_settings
.
gravatar_enabled
.
should
be_false
current_application_settings
.
gravatar_enabled
.
should
be_false
current_application_settings
.
home_page_url
.
should
==
'https://about.gitlab.com/'
page
.
should
have_content
'Application settings saved successfully'
page
.
should
have_content
'Application settings saved successfully'
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment