Commit 7a478704 authored by Jonne Haß's avatar Jonne Haß

just stop settingslogic from breaking rspec output for now

parent 06d9ff22
--format documentation
--format Fuubar
--profile
--color
--tag ~performance
......
......@@ -77,6 +77,7 @@ HELP
normalize_admins
normalize_pod_services
deprecate_hoptoad_api_key
self[:to_ary] = []
end
def self.configured_services
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment