Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Milan
diaspora
Commits
7a478704
Commit
7a478704
authored
Sep 26, 2012
by
Jonne Haß
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
just stop settingslogic from breaking rspec output for now
parent
06d9ff22
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
10 deletions
+11
-10
.rspec
.rspec
+1
-1
app/models/app_config.rb
app/models/app_config.rb
+1
-0
spec/models/app_config_spec.rb
spec/models/app_config_spec.rb
+9
-9
No files found.
.rspec
View file @
7a478704
--format
documentation
--format
Fuubar
--profile
--color
--tag ~performance
...
...
app/models/app_config.rb
View file @
7a478704
...
...
@@ -77,6 +77,7 @@ HELP
normalize_admins
normalize_pod_services
deprecate_hoptoad_api_key
self
[
:to_ary
]
=
[]
end
def
self
.
configured_services
...
...
spec/models/app_config_spec.rb
View file @
7a478704
...
...
@@ -184,10 +184,6 @@ describe AppConfig do
ENV
[
"REDISTOGO_URL"
]
=
"redis://myserver"
end
after
do
ENV
[
"REDISTOGO_URL"
]
=
nil
end
it
"uses that"
do
AppConfig
.
get_redis_instance
.
client
.
host
.
should
==
"myserver"
end
...
...
@@ -195,13 +191,10 @@ describe AppConfig do
context
"with REDIS_URL set"
do
before
do
ENV
[
"REDISTOGO_URL"
]
=
nil
ENV
[
"REDIS_URL"
]
=
"redis://yourserver"
end
after
do
ENV
[
"REDIS_URL"
]
=
nil
end
it
"uses that"
do
AppConfig
.
get_redis_instance
.
client
.
host
.
should
==
"yourserver"
end
...
...
@@ -210,10 +203,11 @@ describe AppConfig do
context
"with redis_url set"
do
before
do
AppConfig
[
:redis_url
]
=
"redis://ourserver"
ENV
[
"REDISTOGO_URL"
]
=
nil
ENV
[
"REDIS_URL"
]
=
nil
end
after
do
AppConfig
[
:redis_url
]
=
""
end
it
"uses that"
do
...
...
@@ -222,6 +216,12 @@ describe AppConfig do
end
context
"with nothing set"
do
before
do
AppConfig
[
:redis_url
]
=
""
ENV
[
"REDISTOGO_URL"
]
=
nil
ENV
[
"REDIS_URL"
]
=
nil
end
it
"uses localhost"
do
AppConfig
.
get_redis_instance
.
client
.
host
.
should
==
"127.0.0.1"
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