@@ -1,14 +1,14 @@ module AuthenticatedTestHelper # Sets the current user in the session from the user fixtures. def login_as(user) - @request.session[:user_id] = user ? users(user).id : nil + @request.session[:user_id] = user ? user.id : nil end def authorize_as(user) - @request.env["HTTP_AUTHORIZATION"] = user ? ActionController::HttpAuthentication::Basic.encode_credentials(users(user).login, 'test') : nil + @request.env["HTTP_AUTHORIZATION"] = user ? ActionController::HttpAuthentication::Basic.encode_credentials(user.login, 'test') : nil end - + def tokenize_as(token) - @request.session[:token_id] = token ? auth_tokens(token).id : nil + @request.session[:token_id] = token ? token.id : nil end end lib/authenticated_test_helper.rb @@ -1,23 +1,22 @@ require File.dirname(__FILE__) + '/../spec_helper' describe AuditsController do - fixtures :users, :domains, :records - + before(:each) do - login_as(:admin) + login_as(Factory(:admin)) end - + it "should have a search form" do get :index - + pending end it "should have a domain details page" do - get :domain, :id => domains(:example_com).id - + get :domain, :id => Factory(:domain).id + assigns[:domain].should_not be_nil - + response.should render_template('domain') end end spec/controllers/audits_controller_spec.rb @@ -1,51 +1,52 @@ require File.dirname(__FILE__) + '/../spec_helper' describe AuthTokensController do - fixtures :all - + it "should not allow access to admins or owners" do - login_as(:admin) + login_as( Factory(:admin) ) post :create response.code.should eql("401") - - login_as(:quentin) + + login_as(Factory(:quentin)) post :create response.code.should eql("401") end - + it "should bail cleanly on missing auth_token" do - login_as(:token_user) + login_as(Factory(:token_user)) post :create response.code.should eql("422") end - + it "should bail cleanly on missing domains" do - login_as(:token_user) - + login_as(Factory(:token_user)) + post :create, :auth_token => { :domain => 'example.org' } - + response.code.should eql("404") end - + it "bail cleanly on invalid requests" do - login_as(:token_user) - + Factory(:domain) + + login_as(Factory(:token_user)) + post :create, :auth_token => { :domain => 'example.com' } - + response.should have_tag('error') end - + describe "generating tokens" do - + before(:each) do - login_as(:token_user) - - @domain = domains(:example_com) + login_as(Factory(:token_user)) + + @domain = Factory(:domain) @params = { :domain => @domain.name, :expires_at => 1.hour.since.to_s(:rfc822) } end - + it "with allow_new set" do post :create, :auth_token => @params.merge(:allow_new => 'true') @@ -54,68 +55,79 @@ describe AuthTokensController do with_tag('auth_token') with_tag('url') end - + assigns[:auth_token].should_not be_nil - assigns[:auth_token].domain.should eql( domains(:example_com) ) + assigns[:auth_token].domain.should eql( @domain ) assigns[:auth_token].should be_allow_new_records end - + it "with remove set" do + a = Factory(:www, :domain => @domain) post :create, :auth_token => @params.merge(:remove => 'true', :record => ['www.example.com']) - + response.should have_tag('token') do with_tag('expires') with_tag('auth_token') with_tag('url') end - + assigns[:auth_token].remove_records?.should be_true - assigns[:auth_token].can_remove?( records(:example_com_a_www) ).should be_true + assigns[:auth_token].can_remove?( a ).should be_true end - + it "with policy set" do post :create, :auth_token => @params.merge(:policy => 'allow') - + response.should have_tag('token') do with_tag('expires') with_tag('auth_token') with_tag('url') end - + assigns[:auth_token].policy.should eql(:allow) end - + it "with protected records" do + a = Factory(:a, :domain => @domain) + www = Factory(:www, :domain => @domain) + mx = Factory(:mx, :domain => @domain) + post :create, :auth_token => @params.merge( :protect => ['example.com:A', 'www.example.com'], :policy => 'allow' ) - + response.should have_tag('token') do with_tag('expires') with_tag('auth_token') with_tag('url') end - + assigns[:auth_token].should_not be_nil - assigns[:auth_token].can_change?( records(:example_com_a) ).should be_false - assigns[:auth_token].can_change?( records(:example_com_mx) ).should be_true - assigns[:auth_token].can_change?( records(:example_com_a_www) ).should be_false + assigns[:auth_token].can_change?( a ).should be_false + assigns[:auth_token].can_change?( mx ).should be_true + assigns[:auth_token].can_change?( www ).should be_false end - + it "with protected record types" do + mx = Factory(:mx, :domain => @domain) + post :create, :auth_token => @params.merge(:policy => 'allow', :protect_type => ['MX']) - - assigns[:auth_token].can_change?( records(:example_com_mx) ).should be_false + + assigns[:auth_token].can_change?( mx ).should be_false end - + it "with allowed records" do + a = Factory(:a, :domain => @domain) + www = Factory(:www, :domain => @domain) + mx = Factory(:mx, :domain => @domain) + post :create, :auth_token => @params.merge(:record => ['example.com']) - - assigns[:auth_token].can_change?( records(:example_com_a_www) ).should be_false - assigns[:auth_token].can_change?( records(:example_com_a) ).should be_true - assigns[:auth_token].can_change?( records(:example_com_mx) ).should be_true + + assigns[:auth_token].can_change?( www ).should be_false + assigns[:auth_token].can_change?( a ).should be_true + assigns[:auth_token].can_change?( mx ).should be_true end - + end end spec/controllers/auth_tokens_controller_spec.rb @@ -1,20 +1,24 @@ require File.dirname(__FILE__) + '/../spec_helper' describe DashboardController, "and admins" do - fixtures :all - + before(:each) do - session[:user_id] = users(:admin) - + login_as( Factory(:admin) ) + + Factory(:domain) + + zt = Factory(:zone_template) + Factory(:template_soa, :zone_template => zt) + get :index end it "should have a list of the latest zones" do assigns[:latest_domains].should_not be_empty end - + it "should have a list of templates for quick zone additions" do assigns[:zone_templates].should_not be_empty end - + end spec/controllers/dashboard_controller_spec.rb @@ -1,12 +1,11 @@ require File.dirname(__FILE__) + '/../spec_helper' -include AuthenticatedTestHelper - describe DomainsController, "index" do - fixtures :all it "should display all zones to the admin" do - login_as(:admin) + login_as(Factory(:admin)) + + Factory(:domain) get 'index' @@ -16,7 +15,11 @@ describe DomainsController, "index" do end it "should restrict zones for owners" do - login_as( :quentin ) + quentin = Factory(:quentin) + Factory(:domain, :user => quentin) + Factory(:domain, :name => 'example.net') + + login_as( quentin ) get 'index' @@ -26,7 +29,9 @@ describe DomainsController, "index" do end it "should display all zones as XML" do - login_as(:admin) + login_as(Factory(:admin)) + + Factory(:domain) get :index, :format => 'xml' @@ -36,22 +41,27 @@ describe DomainsController, "index" do end describe DomainsController, "when creating" do - fixtures :all before(:each) do - login_as(:admin) + login_as(Factory(:admin)) end it "should have a form for adding a new zone" do + Factory(:template_soa, :zone_template => Factory(:zone_template)) + Factory(:zone_template, :name => 'No SOA') + get 'new' response.should render_template('domains/new') assigns[:domain].should be_a_kind_of( Domain ) assigns[:zone_templates].should_not be_empty - assigns[:zone_templates].size.should be(3) + assigns[:zone_templates].size.should be(1) end it "should not save a partial form" do + Factory(:template_soa, :zone_template => Factory(:zone_template)) + Factory(:zone_template, :name => 'No SOA') + post 'create', :domain => { :name => 'example.org' }, :zone_template => { :id => "" } response.should_not be_redirect @@ -60,7 +70,8 @@ describe DomainsController, "when creating" do end it "should build from a zone template if selected" do - zone_template = zone_templates(:east_coast_dc) + zone_template = Factory(:zone_template) + Factory(:template_soa, :zone_template => zone_template) post 'create', :domain => { :name => 'example.org', :zone_template_id => zone_template.id } @@ -81,7 +92,7 @@ describe DomainsController, "when creating" do end it "should ignore the zone template if a slave is created" do - zone_template = zone_templates(:east_coast_dc) + zone_template = Factory(:zone_template) post 'create', :domain => { :name => 'example.org', @@ -99,17 +110,16 @@ describe DomainsController, "when creating" do end describe DomainsController do - fixtures :all before(:each) do - login_as(:admin) + login_as(Factory(:admin)) end it "should accept ownership changes" do - domain = domains(:example_com) + domain = Factory(:domain) lambda { - put :change_owner, :id => domain.id, :domain => { :user_id => users(:quentin).id } + put :change_owner, :id => domain.id, :domain => { :user_id => Factory(:quentin).id } domain.reload }.should change( domain, :user_id ) @@ -118,13 +128,12 @@ describe DomainsController do end describe DomainsController, "and macros" do - fixtures :all before(:each) do - login_as(:admin) + login_as(Factory(:admin)) @macro = Factory(:macro) - @domain = domains(:example_com) + @domain = Factory(:domain) end it "should have a selection for the user" do @@ -147,12 +156,11 @@ describe DomainsController, "and macros" do end describe DomainsController, "should handle a REST client" do - fixtures :all before(:each) do - authorize_as(:api_client) + authorize_as(Factory(:api_client)) - @domain = domains(:example_com) + @domain = Factory(:domain) end it "creating a new zone without a template" do @@ -168,16 +176,22 @@ describe DomainsController, "should handle a REST client" do end it "creating a zone with a template" do + zt = Factory(:zone_template) + Factory(:template_soa, :zone_template => zt) + post 'create', :domain => { :name => 'example.org', - :zone_template_id => zone_templates(:east_coast_dc).id }, + :zone_template_id => zt.id }, :format => "xml" response.should have_tag( 'domain' ) end it "creating a zone with a named template" do + zt = Factory(:zone_template) + Factory(:template_soa, :zone_template => zt) + post 'create', :domain => { :name => 'example.org', - :zone_template_name => zone_templates(:east_coast_dc).name }, + :zone_template_name => zt.name }, :format => "xml" response.should have_tag( 'domain' ) @@ -242,14 +256,16 @@ describe DomainsController, "should handle a REST client" do end describe DomainsController, "and auth tokens" do - fixtures :all before(:each) do - tokenize_as(:token_example_com) + @domain = Factory(:domain) + @token = Factory(:auth_token, :user => Factory(:admin), :domain => @domain) + + tokenize_as(@token) end it "should display the domain in the token" do - get :show, :id => domains(:example_com) + get :show, :id => @domain.id response.should render_template('domains/show') end @@ -257,7 +273,7 @@ describe DomainsController, "and auth tokens" do it "should restrict the domain to that of the token" do get :show, :id => rand(1_000_000) - assigns[:domain].should eql(domains(:example_com)) + assigns[:domain].should eql(@domain) end it "should not allow a list of domains" do @@ -267,7 +283,7 @@ describe DomainsController, "and auth tokens" do end it "should not accept updates to the domain" do - put :update, :id => domains(:example_com), :domain => { :name => 'hack' } + put :update, :id => @domain, :domain => { :name => 'hack' } response.should be_redirect end spec/controllers/domains_controller_spec.rb @@ -13,10 +13,8 @@ end describe MacroStepsController do - fixtures :users, :roles - before(:each) do - login_as(:admin) + login_as(Factory(:admin)) @macro = Factory(:macro) @step = Factory(:macro_step_create, @@ -41,12 +39,12 @@ describe MacroStepsController do it "should position a valid step correctly" do post :create, :macro_id => @macro.id, - :macro_step => { - :action => 'create', - :record_type => 'A', - :name => 'www', - :content => '127.0.0.1', - :position => '1' + :macro_step => { + :action => 'create', + :record_type => 'A', + :name => 'www', + :content => '127.0.0.1', + :position => '1' }, :format => 'js' assigns[:macro_step].position.should == 1 @@ -86,7 +84,7 @@ describe MacroStepsController do it "should re-position existing steps" do Factory(:macro_step_create, :macro => @macro) - + put :update, :macro_id => @macro.id, :id => @step.id, :macro_step => { :position => '2' } @@ -99,8 +97,8 @@ describe MacroStepsController do flash[:info].should_not be_blank response.should be_redirect response.should redirect_to(macro_path(@macro)) - + lambda { @step.reload }.should raise_error( ActiveRecord::RecordNotFound ) end - + end spec/controllers/macro_steps_controller_spec.rb @@ -1,12 +1,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe MacrosController, "for admins" do - fixtures :users, :roles - + before(:each) do - login_as(:admin) + login_as( Factory(:admin) ) @macro = Factory(:macro) + + Factory(:quentin) end it "should have a list of macros" do @@ -66,7 +67,7 @@ describe MacrosController, "for admins" do response.should render_template('macros/edit') end - + it "should accept valid updates to macros" do lambda { put :update, :id => @macro.id, :macro => { :name => 'Foo Macro' } @@ -97,16 +98,16 @@ describe MacrosController, "for admins" do response.should be_redirect response.should redirect_to( macros_path ) end - + end describe MacrosController, "for owners" do - fixtures :users, :roles before(:each) do - login_as(:quentin) + quentin = Factory(:quentin) + login_as(quentin) - @macro = Factory(:macro, :user => users(:quentin)) + @macro = Factory(:macro, :user => quentin) end it "should have a form to create a new macro" do @@ -117,6 +118,6 @@ describe MacrosController, "for owners" do response.should render_template('macros/edit') end - + end spec/controllers/macros_controller_spec.rb @@ -1,23 +1,21 @@ require File.dirname(__FILE__) + '/../spec_helper' -include AuthenticatedTestHelper - describe RecordTemplatesController, "when updating SOA records" do - fixtures :all - + it "should accept a valid update" do - login_as(:admin) - - target_soa = record_templates(:east_coast_soa) - + login_as(Factory(:admin)) + + zt = Factory(:zone_template) + target_soa = Factory(:template_soa, :zone_template => zt) + put "update", :id => target_soa.id, :record_template => { - :retry => "7200", :primary_ns => 'ns1.provider.net', + :retry => "7200", :primary_ns => 'ns1.provider.net', :contact => 'east-coast@example.com', :refresh => "10800", :minimum => "10800", :expire => "604800" } - + target_soa.reload - target_soa.primary_ns.should eql('ns1.provider.net') + target_soa.primary_ns.should eql('ns1.provider.net') end - + end spec/controllers/record_template_controller_spec.rb @@ -1,12 +1,10 @@ require File.dirname(__FILE__) + '/../spec_helper' describe RecordsController, ", users, and non-SOA records" do - fixtures :users, :domains, :records - before( :each ) do - login_as(:admin) + login_as(Factory(:admin)) - @domain = domains( :example_com ) + @domain = Factory(:domain) end # Test adding various records @@ -49,7 +47,7 @@ describe RecordsController, ", users, and non-SOA records" do end it "should update when valid" do - record = records(:example_com_ns_ns2) + record = Factory(:ns, :domain => @domain) params = { 'name' => "", @@ -64,7 +62,7 @@ describe RecordsController, ", users, and non-SOA records" do end it "shouldn't update when invalid" do - record = records(:example_com_ns_ns2) + record = Factory(:ns, :domain => @domain) params = { 'name' => "@", @@ -83,7 +81,7 @@ describe RecordsController, ", users, and non-SOA records" do end it "should destroy when requested to do so" do - delete :destroy, :domain_id => @domain.id, :id => records(:example_com_mx).id + delete :destroy, :domain_id => @domain.id, :id => Factory(:mx, :domain => @domain).id response.should be_redirect response.should redirect_to( domain_path( @domain ) ) @@ -92,12 +90,10 @@ describe RecordsController, ", users, and non-SOA records" do end describe RecordsController, ", users, and SOA records" do - fixtures :all - it "should update when valid" do - login_as(:admin) + login_as( Factory(:admin) ) - target_soa = records(:example_com_soa) + target_soa = Factory(:domain).soa_record put "update_soa", :id => target_soa.id, :domain_id => target_soa.domain.id, :soa => { @@ -111,19 +107,19 @@ describe RecordsController, ", users, and SOA records" do end describe RecordsController, "and tokens" do - fixtures :auth_tokens, :domains, :records, :users - before( :each ) do - @domain = domains( :example_com ) + @domain = Factory(:domain) + @admin = Factory(:admin) @token = AuthToken.new( - :domain => @domain, :expires_at => 1.hour.since, :user => users(:admin) + :domain => @domain, :expires_at => 1.hour.since, :user => @admin ) end it "should not be allowed to touch the SOA record" do - tokenize_as(:token_example_com) + token = Factory(:auth_token, :domain => @domain, :user => @admin) + tokenize_as( token ) - target_soa = records(:example_com_soa) + target_soa = @domain.soa_record lambda { put "update_soa", :id => target_soa.id, :domain_id => target_soa.domain.id, @@ -156,7 +152,7 @@ describe RecordsController, "and tokens" do it "should not allow updating NS records" do controller.stubs(:current_token).returns(@token) - record = records(:example_com_ns_ns1) + record = Factory(:ns, :domain => @domain) params = { 'name' => '', @@ -218,7 +214,7 @@ describe RecordsController, "and tokens" do end it "should update when allowed" do - record = records(:example_com_a_www) + record = Factory(:www, :domain => @domain) @token.can_change( record ) controller.stubs(:current_token).returns( @token ) @@ -239,7 +235,7 @@ describe RecordsController, "and tokens" do end it "should not update if not allowed" do - record = records(:example_com_a_www) + record = Factory(:www, :domain => @domain) controller.stubs(:current_token).returns(@token) params = { @@ -259,7 +255,7 @@ describe RecordsController, "and tokens" do end it "should destroy when allowed" do - record = records(:example_com_mx) + record = Factory(:mx, :domain => @domain) @token.can_change( record ) @token.remove_records=( true ) controller.stubs(:current_token).returns(@token) @@ -274,9 +270,10 @@ describe RecordsController, "and tokens" do it "should not destroy records if not allowed" do controller.stubs(:current_token).returns( @token ) + record = Factory(:a, :domain => @domain) lambda { - delete :destroy, :domain_id => @domain.id, :id => records(:example_com_a) + delete :destroy, :domain_id => @domain.id, :id => record.id }.should_not change( @domain.records, :count ) response.should_not be_success @@ -293,7 +290,7 @@ describe RecordsController, "and tokens" do 'content' => '127.0.0.3' } - post :create, :domain_id => domains(:example_net).id, :record => record + post :create, :domain_id => Factory(:domain, :name => 'example.net').id, :record => record response.code.should == "403" end spec/controllers/records_controller_spec.rb @@ -1,69 +1,68 @@ require File.dirname(__FILE__) + '/../spec_helper' -include AuthenticatedTestHelper - describe ReportsController, "index" do - fixtures :all - before(:each) do - login_as(:admin) + login_as(Factory(:admin)) + + Factory(:domain) + q = Factory(:quentin) + Factory(:domain, :name => 'example.net', :user => q) end - + it "should display all users to the admin" do get 'index' - + response.should render_template('reports/index') assigns[:users].should_not be_empty assigns[:users].size.should be(1) end - + it "should display total system domains and total domains to the admin" do get 'index' - + response.should render_template('reports/index') assigns[:total_domains].should be(Domain.count) - assigns[:system_domains].should be(2) + assigns[:system_domains].should be(1) end end describe ReportsController, "results" do - fixtures :all - before(:each) do - login_as(:admin) + login_as(Factory(:admin)) end - + it "should display a list of users for a search hit" do + Factory(:aaron) + Factory(:api_client) + get 'results', :q => "a" - + response.should render_template('reports/results') assigns[:results].should_not be_empty assigns[:results].size.should be(3) end - + it "should redirect to reports/index if the search query is empty" do get 'results' , :q => "" - + response.should be_redirect response.should redirect_to( reports_path ) end - + end describe ReportsController , "view" do - fixtures :all - before(:each) do - login_as(:admin) + login_as(Factory(:admin)) end - + it "should show a user reports" do - get "view" , :id => users(:aaron) - + get "view" , :id => Factory(:aaron).id + response.should render_template("reports/view") assigns[:user].should_not be_nil assigns[:user].login.should have_text('aaron') end - + end spec/controllers/reports_controller_spec.rb @@ -1,38 +1,42 @@ require File.dirname(__FILE__) + '/../spec_helper' describe SearchController do - fixtures :all - + before(:each) do - session[:user_id] = users(:admin).id + session[:user_id] = Factory(:admin).id + + Factory(:domain, :name => 'example.com') + Factory(:domain, :name => 'example.net') end - + it "should return results when searched legally" do get :results, :q => 'exa' - + assigns[:results].should_not be_nil - response.should render_template('results') + response.should render_template('search/results') end - + it "should handle whitespace in the query" do get :results, :q => ' exa ' - + assigns[:results].should_not be_nil response.should render_template('results') end - + it "should redirect to the index page when nothing has been searched for" do get :results, :q => '' - + response.should be_redirect response.should redirect_to( root_path ) end - + it "should redirect to the domain page if only one result is found" do + domain = Factory(:domain, :name => 'slave-example.com') + get :results, :q => 'slave-example.com' - + response.should be_redirect - response.should redirect_to( domain_path( domains(:slave_example_com) ) ) + response.should redirect_to( domain_path( domain ) ) end end spec/controllers/search_controller_spec.rb @@ -1,11 +1,9 @@ require File.dirname(__FILE__) + '/../spec_helper' -# Be sure to include AuthenticatedTestHelper in spec/spec_helper.rb instead -# Then, you can remove it from this and the units test. -include AuthenticatedTestHelper - describe SessionsController, "and users" do - fixtures :users + before(:each) do + @quentin = Factory(:quentin) + end it 'logins and redirects' do post :create, :login => 'quentin', :password => 'test' @@ -20,7 +18,7 @@ describe SessionsController, "and users" do end it 'logs out' do - login_as :quentin + login_as @quentin get :destroy session[:user_id].should be_nil response.should be_redirect @@ -37,28 +35,28 @@ describe SessionsController, "and users" do end it 'deletes token on logout' do - login_as :quentin + login_as @quentin get :destroy response.cookies["auth_token"].should be_nil end it 'logs in with cookie' do - users(:quentin).remember_me - request.cookies["auth_token"] = cookie_for(:quentin) + @quentin.remember_me + request.cookies["auth_token"] = cookie_for(@quentin) get :new controller.send(:logged_in?).should be_true end it 'fails expired cookie login' do - users(:quentin).remember_me - users(:quentin).update_attribute :remember_token_expires_at, 5.minutes.ago - request.cookies["auth_token"] = cookie_for(:quentin) + @quentin.remember_me + @quentin.update_attribute :remember_token_expires_at, 5.minutes.ago + request.cookies["auth_token"] = cookie_for(@quentin) get :new controller.send(:logged_in?).should_not be_true end it 'fails cookie login' do - users(:quentin).remember_me + @quentin.remember_me request.cookies["auth_token"] = auth_token('invalid_auth_token') get :new controller.send(:logged_in?).should_not be_true @@ -69,19 +67,24 @@ describe SessionsController, "and users" do end def cookie_for(user) - auth_token users(user).remember_token + auth_token user.remember_token end end describe SessionsController, "and auth tokens" do - fixtures :auth_tokens, :domains + + before(:each) do + @domain = Factory(:domain) + @user = Factory(:admin) + @token = Factory(:auth_token, :domain => @domain, :user => @user) + end it 'accepts and redirects' do post :token, :token => '5zuld3g9dv76yosy' session[:token_id].should_not be_nil controller.send(:token_user?).should be_true response.should be_redirect - response.should redirect_to( domain_path( domains(:example_com) ) ) + response.should redirect_to( domain_path( @domain ) ) end it 'fails login and does not redirect' do @@ -91,14 +94,14 @@ describe SessionsController, "and auth tokens" do end it 'logs out' do - tokenize_as(:token_example_com) + tokenize_as(@token) get :destroy session[:token_id].should be_nil response.should redirect_to( session_path ) end it 'fails expired cookie login' do - auth_tokens(:token_example_com).update_attribute :expires_at, 5.minutes.ago + @token.update_attribute :expires_at, 5.minutes.ago get :new controller.send(:token_user?).should_not be_true end spec/controllers/sessions_controller_spec.rb @@ -1,70 +1,72 @@ require File.dirname(__FILE__) + '/../spec_helper' -include AuthenticatedTestHelper - describe TemplatesController, "and admins" do - fixtures :all - before(:each) do - login_as(:admin) + login_as(Factory(:admin)) end - + it "should have a template list" do + Factory(:zone_template) + get :index - + assigns[:zone_templates].should_not be_empty assigns[:zone_templates].size.should be( ZoneTemplate.count ) end it "should have a list of users when showing the new form" do + Factory(:quentin) + get :new - + assigns[:users].should_not be_empty assigns[:users].each { |u| u.has_role?('owner').should be_true } end it "should have a detailed view of a template" do - get :show, :id => zone_templates(:east_coast_dc) + get :show, :id => Factory(:zone_template).id assigns[:zone_template].should_not be_nil assigns[:record_template].should be_a_new_record response.should render_template('templates/show') end - + end describe TemplatesController, "and users" do - fixtures :all - before(:each) do - login_as(:quentin) + @quentin = Factory(:quentin) + login_as(@quentin) end - + it "should have a limited list" do + Factory(:zone_template, :user => @quentin) + Factory(:zone_template, :name => '!Quentin') + get :index - + assigns[:zone_templates].should_not be_empty assigns[:zone_templates].size.should be(1) end - + it "should not have a list of users when showing the new form" do get :new - + assigns[:users].should be_nil end end describe TemplatesController, "should handle a REST client" do - fixtures :all - before(:each) do - authorize_as(:api_client) + authorize_as(Factory(:api_client)) end - + it "asking for a list of templates" do + Factory(:zone_template) + get :index, :format => "xml" - + response.should have_tag('zone-templates') do with_tag('zone-template') end spec/controllers/templates_controller_spec.rb @@ -1,39 +1,38 @@ require File.dirname(__FILE__) + '/../spec_helper' describe UsersController do - + describe "without an admin" do it "should require a login" do get 'index' - + response.should redirect_to( new_session_path ) end end - + describe "with an admin" do - fixtures :all - before(:each) do - login_as( :admin ) + @admin = Factory(:admin) + login_as( @admin ) end - + it "should show a list of current users" do get 'index' - + response.should render_template( 'users/index') assigns[:users].should_not be_empty end - + it 'should load a users details' do - get 'show', :id => users(:admin).id - + get 'show', :id => @admin.id + response.should render_template( 'users/show' ) assigns[:user].should_not be_nil end - + it 'should have a form for creating a new user' do get 'new' - + response.should render_template( 'users/form' ) assigns[:user].should_not be_nil end @@ -101,10 +100,10 @@ describe UsersController do response.should be_redirect response.should redirect_to( user_path( assigns[:user] ) ) end - + it 'should update a user without password changes' do - user = users(:quentin) - + user = Factory(:quentin) + lambda { post :update, :id => user.id, :user => { :email => 'new@example.com', @@ -113,15 +112,15 @@ describe UsersController do } user.reload }.should change( user, :email ) - + response.should be_redirect response.should redirect_to( user_path( user ) ) end it 'should be able to suspend users' do - @user = users(:quentin) + @user = Factory(:quentin) put 'suspend', :id => @user.id - + response.should be_redirect response.should redirect_to( users_path ) end spec/controllers/users_controller_spec.rb @@ -15,7 +15,7 @@ Factory.define :admin, :class => User do |f| f.email 'admin@example.com' f.password 'test' f.password_confirmation 'test' - f.roles [ Factory(:admin_role) ] + f.roles [ Role.find_by_name('admin') || Factory(:admin_role) ] end Factory.define(:quentin, :class => User) do |f| @@ -23,7 +23,7 @@ Factory.define(:quentin, :class => User) do |f| f.email 'quentin@example.com' f.password 'test' f.password_confirmation 'test' - f.roles [ Factory(:owner_role) ] + f.roles [ Role.find_by_name('owner') || Factory(:owner_role) ] end Factory.define(:aaron, :class => User) do |f| @@ -32,3 +32,19 @@ Factory.define(:aaron, :class => User) do |f| f.password 'test' f.password_confirmation 'test' end + +Factory.define(:token_user, :class => User) do |f| + f.login 'token' + f.email 'token@example.com' + f.password 'test' + f.password_confirmation 'test' + f.roles [ Role.find_by_name('auth_token') || Factory(:auth_token_role) ] +end + +Factory.define(:api_client, :class => User) do |f| + f.login 'api' + f.email 'api@example.com' + f.password 'test' + f.password_confirmation 'test' + f.roles [ Role.find_by_name('admin_role') || Factory(:admin_role) ] +end spec/factories/users_factory.rb 9703ad59629d59ed32da3ce5d696c9ef3d5cfd3d Kenneth Kalmer kenneth.kalmer@gmail.com http://github.com/kennethkalmer/powerdns-on-rails/commit/51918c9a6c8485d11395852f1f78e4b60c915862 51918c9a6c8485d11395852f1f78e4b60c915862 2009-09-21T13:42:36-07:00 2009-09-21T13:41:26-07:00 fixture-less controller specs ceabe6bd44ba04174edb1a93f313a6ac0fc50cbc Kenneth Kalmer kenneth.kalmer@gmail.com