remove unnecesary stuff from specs
This commit is contained in:
parent
99abc22403
commit
be2db47f02
8 changed files with 3 additions and 40 deletions
|
|
@ -52,15 +52,10 @@ describe RegistrationsController do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
describe "#create" do
|
describe "#create" do
|
||||||
context "with valid parameters" do
|
context "with valid parameters" do
|
||||||
before do
|
before do
|
||||||
AppConfig.settings.enable_registrations = true
|
AppConfig.settings.enable_registrations = true
|
||||||
end
|
|
||||||
|
|
||||||
before do
|
|
||||||
user = FactoryGirl.build(:user)
|
user = FactoryGirl.build(:user)
|
||||||
User.stub!(:build).and_return(user)
|
User.stub!(:build).and_return(user)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -17,8 +17,6 @@ describe ServicesController do
|
||||||
|
|
||||||
before do
|
before do
|
||||||
@user = alice
|
@user = alice
|
||||||
@aspect = @user.aspects.first
|
|
||||||
|
|
||||||
sign_in :user, @user
|
sign_in :user, @user
|
||||||
@controller.stub!(:current_user).and_return(@user)
|
@controller.stub!(:current_user).and_return(@user)
|
||||||
mock_access_token.stub!(:token => "12345", :secret => "56789")
|
mock_access_token.stub!(:token => "12345", :secret => "56789")
|
||||||
|
|
@ -106,5 +104,4 @@ describe ServicesController do
|
||||||
}.should change(@user.services, :count).by(-1)
|
}.should change(@user.services, :count).by(-1)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ require 'spec_helper'
|
||||||
describe StatusMessagesController do
|
describe StatusMessagesController do
|
||||||
before do
|
before do
|
||||||
@aspect1 = alice.aspects.first
|
@aspect1 = alice.aspects.first
|
||||||
@aspect2 = bob.aspects.first
|
|
||||||
|
|
||||||
request.env["HTTP_REFERER"] = ""
|
request.env["HTTP_REFERER"] = ""
|
||||||
sign_in :user, alice
|
sign_in :user, alice
|
||||||
|
|
@ -55,8 +54,7 @@ describe StatusMessagesController do
|
||||||
|
|
||||||
describe '#new' do
|
describe '#new' do
|
||||||
it 'succeeds' do
|
it 'succeeds' do
|
||||||
get :new,
|
get :new, :person_id => bob.person.id
|
||||||
:person_id => bob.person.id
|
|
||||||
response.should be_success
|
response.should be_success
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,6 @@ require 'spec_helper'
|
||||||
describe UsersController do
|
describe UsersController do
|
||||||
before do
|
before do
|
||||||
@user = alice
|
@user = alice
|
||||||
@aspect = @user.aspects.first
|
|
||||||
@aspect1 = @user.aspects.create(:name => "super!!")
|
|
||||||
sign_in :user, @user
|
sign_in :user, @user
|
||||||
@controller.stub(:current_user).and_return(@user)
|
@controller.stub(:current_user).and_return(@user)
|
||||||
end
|
end
|
||||||
|
|
@ -60,6 +58,7 @@ describe UsersController do
|
||||||
get :public, :username => @user.username
|
get :public, :username => @user.username
|
||||||
response.should be_redirect
|
response.should be_redirect
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'redirects to a profile page if mobile is requested' do
|
it 'redirects to a profile page if mobile is requested' do
|
||||||
get :public, :username => @user.username, :format => :mobile
|
get :public, :username => @user.username, :format => :mobile
|
||||||
response.should be_redirect
|
response.should be_redirect
|
||||||
|
|
@ -210,7 +209,6 @@ describe UsersController do
|
||||||
Resque.should_receive(:enqueue).with(Jobs::DeleteAccount, anything)
|
Resque.should_receive(:enqueue).with(Jobs::DeleteAccount, anything)
|
||||||
delete :destroy, :user => { :current_password => "bluepin7" }
|
delete :destroy, :user => { :current_password => "bluepin7" }
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#confirm_email' do
|
describe '#confirm_email' do
|
||||||
|
|
@ -252,4 +250,3 @@ describe UsersController do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,18 +5,7 @@
|
||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe LayoutHelper do
|
describe LayoutHelper do
|
||||||
include ApplicationHelper
|
|
||||||
before do
|
|
||||||
@user = alice
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "#page_title" do
|
describe "#page_title" do
|
||||||
before do
|
|
||||||
def current_user
|
|
||||||
@current_user
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context "passed blank text" do
|
context "passed blank text" do
|
||||||
it "returns Diaspora*" do
|
it "returns Diaspora*" do
|
||||||
page_title.should == pod_name
|
page_title.should == pod_name
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,7 @@
|
||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe Reshare do
|
describe Reshare do
|
||||||
include ActionView::Helpers::UrlHelper
|
|
||||||
include Rails.application.routes.url_helpers
|
include Rails.application.routes.url_helpers
|
||||||
def controller
|
|
||||||
mock()
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
it 'has a valid Factory' do
|
it 'has a valid Factory' do
|
||||||
FactoryGirl.build(:reshare).should be_valid
|
FactoryGirl.build(:reshare).should be_valid
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,7 @@
|
||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe StatusMessage do
|
describe StatusMessage do
|
||||||
include ActionView::Helpers::UrlHelper
|
|
||||||
include PeopleHelper
|
include PeopleHelper
|
||||||
include Rails.application.routes.url_helpers
|
|
||||||
def controller
|
|
||||||
mock()
|
|
||||||
end
|
|
||||||
|
|
||||||
before do
|
before do
|
||||||
@user = alice
|
@user = alice
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,6 @@ require 'spec_helper'
|
||||||
describe Diaspora::Taggable do
|
describe Diaspora::Taggable do
|
||||||
shared_examples_for "it is taggable" do
|
shared_examples_for "it is taggable" do
|
||||||
include ActionView::Helpers::UrlHelper
|
include ActionView::Helpers::UrlHelper
|
||||||
include Rails.application.routes.url_helpers
|
|
||||||
def controller
|
|
||||||
end
|
|
||||||
|
|
||||||
def tag_link(s)
|
def tag_link(s)
|
||||||
link_to "##{s}", "/tags/#{s}", :class => 'tag'
|
link_to "##{s}", "/tags/#{s}", :class => 'tag'
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue