From 55efe132c5e435db9195ec1382918a4c4ed04f68 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Wed, 29 Jun 2011 17:10:43 -0700 Subject: [PATCH] corrected authorizations_controller_spec to assert on response codes --- app/controllers/authorizations_controller.rb | 2 +- spec/controllers/authorizations_controller_spec.rb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/authorizations_controller.rb b/app/controllers/authorizations_controller.rb index 2bb921bef..902d22c0a 100644 --- a/app/controllers/authorizations_controller.rb +++ b/app/controllers/authorizations_controller.rb @@ -39,7 +39,7 @@ class AuthorizationsController < ApplicationController message = verify(signed_string, Base64.decode64(params[:signature]), public_key, manifest) if not (message =='ok') render :text => message, :status => 403 - elsif manifest["application_base_url"].match(/^https?:\/\/(localhost:\d+|chubbi\.es|www\.cubbi\.es|cubbi\.es)\/$/).nil? + elsif manifest["application_base_url"].match(/^https?:\/\/(localhost|chubbi\.es|www\.cubbi\.es|cubbi\.es)(:\d+)?\/$/).nil? # This will only be temporary (less than a month) while we iron out the kinks in Diaspora Connect. Essentially, # whatever we release people will try to work off of and it sucks to build things on top of non-stable things. # We also started writing a gem that we'll release (around the same time) that makes becoming a Diaspora enabled diff --git a/spec/controllers/authorizations_controller_spec.rb b/spec/controllers/authorizations_controller_spec.rb index f9ebaf2ba..c193cde55 100644 --- a/spec/controllers/authorizations_controller_spec.rb +++ b/spec/controllers/authorizations_controller_spec.rb @@ -65,28 +65,28 @@ describe AuthorizationsController do prepare_manifest("http://chubbi.es/") @controller.stub!(:verify).and_return('ok') post :token, @params_hash - response.body.blank?.should be_false + response.code.should == "200" end it 'renders something for cubbies ' do prepare_manifest("http://cubbi.es/") @controller.stub!(:verify).and_return('ok') post :token, @params_hash - response.body.blank?.should be_false + response.code.should == "200" end it 'renders something for cubbies ' do - prepare_manifest("https://www.cubbi.es/") + prepare_manifest("https://www.cubbi.es:443/") @controller.stub!(:verify).and_return('ok') post :token, @params_hash - response.body.blank?.should be_false + response.code.should == "200" end it 'renders something for localhost' do prepare_manifest("http://localhost:3423/") @controller.stub!(:verify).and_return('ok') post :token, @params_hash - response.body.blank?.should be_false + response.code.should == "200" end it 'renders nothing for myspace' do