just stop settingslogic from breaking rspec output for now

This commit is contained in:
Jonne Haß 2012-09-26 18:54:14 +02:00
parent 06d9ff221d
commit 7a478704d5
3 changed files with 11 additions and 10 deletions

2
.rspec
View file

@ -1,4 +1,4 @@
--format documentation --format Fuubar
--profile --profile
--color --color
--tag ~performance --tag ~performance

View file

@ -77,6 +77,7 @@ HELP
normalize_admins normalize_admins
normalize_pod_services normalize_pod_services
deprecate_hoptoad_api_key deprecate_hoptoad_api_key
self[:to_ary] = []
end end
def self.configured_services def self.configured_services

View file

@ -184,10 +184,6 @@ describe AppConfig do
ENV["REDISTOGO_URL"] = "redis://myserver" ENV["REDISTOGO_URL"] = "redis://myserver"
end end
after do
ENV["REDISTOGO_URL"] = nil
end
it "uses that" do it "uses that" do
AppConfig.get_redis_instance.client.host.should == "myserver" AppConfig.get_redis_instance.client.host.should == "myserver"
end end
@ -195,13 +191,10 @@ describe AppConfig do
context "with REDIS_URL set" do context "with REDIS_URL set" do
before do before do
ENV["REDISTOGO_URL"] = nil
ENV["REDIS_URL"] = "redis://yourserver" ENV["REDIS_URL"] = "redis://yourserver"
end end
after do
ENV["REDIS_URL"] = nil
end
it "uses that" do it "uses that" do
AppConfig.get_redis_instance.client.host.should == "yourserver" AppConfig.get_redis_instance.client.host.should == "yourserver"
end end
@ -210,10 +203,11 @@ describe AppConfig do
context "with redis_url set" do context "with redis_url set" do
before do before do
AppConfig[:redis_url] = "redis://ourserver" AppConfig[:redis_url] = "redis://ourserver"
ENV["REDISTOGO_URL"] = nil
ENV["REDIS_URL"] = nil
end end
after do after do
AppConfig[:redis_url] = ""
end end
it "uses that" do it "uses that" do
@ -222,6 +216,12 @@ describe AppConfig do
end end
context "with nothing set" do context "with nothing set" do
before do
AppConfig[:redis_url] = ""
ENV["REDISTOGO_URL"] = nil
ENV["REDIS_URL"] = nil
end
it "uses localhost" do it "uses localhost" do
AppConfig.get_redis_instance.client.host.should == "127.0.0.1" AppConfig.get_redis_instance.client.host.should == "127.0.0.1"
end end