typo 5.1.2 → 5.1.3

data/spec/controllers/admin/users_controller_spec.rb

@@ -7,59 +7,86 @@ class Admin::UsersController; def rescue_action(e) raise e end; end
 
 describe Admin::UsersController, "rough port of the old functional test" do
   integrate_views
+  fixtures :users
 
-  before(:each) do
-    request.session = { :user => users(:tobi).id }
-  end
+  describe ' when you are admin' do
+    before(:each) do
+      request.session = { :user => users(:tobi).id }
+    end
 
-  def test_index
-    get :index
-    assert_template 'index'
-    assert_template_has 'users'
-  end
+    def test_index
+      get :index
+      assert_template 'index'
+      assert_template_has 'users'
+    end
 
-  def test_list
-    get :list
-    assert_template 'index'
-    assert_template_has 'users'
-  end
+    def test_list
+      get :list
+      assert_template 'index'
+      assert_template_has 'users'
+    end
 
-  def test_new
-    get :new
-    assert_template 'new'
+    def test_new
+      get :new
+      assert_template 'new'
 
-    post :new, :user => { :login => 'errand', :email => 'corey@test.com',
-      :password => 'testpass', :password_confirmation => 'testpass', :profile_id => 1 }
-    assert_response :redirect, :action => 'index'
-    follow_redirect
-    assert_template 'index'
-  end
+      post :new, :user => { :login => 'errand', :email => 'corey@test.com',
+        :password => 'testpass', :password_confirmation => 'testpass', :profile_id => 1 }
+      assert_response :redirect, :action => 'index'
+      follow_redirect
+      assert_template 'index'
+    end
 
-  def test_edit
-    user_id = users(:tobi).id
-    get :edit, :id => user_id
-    assert_template 'edit'
-    assert_valid assigns(:user)
+    def test_edit
+      user_id = users(:tobi).id
+      get :edit, :id => user_id
+      assert_template 'edit'
+      assert_valid assigns(:user)
 
-    post :edit, :id => user_id, :user => { :login => 'errand',
-      :email => 'corey@test.com', :password => 'testpass',
-      :password_confirmation => 'testpass' }
-    assert_response :redirect, :action => 'index'
-    follow_redirect
-    assert_template 'index'
+      post :edit, :id => user_id, :user => { :login => 'errand',
+        :email => 'corey@test.com', :password => 'testpass',
+        :password_confirmation => 'testpass' }
+      assert_response :redirect, :action => 'index'
+      follow_redirect
+      assert_template 'index'
+    end
+
+    def test_destroy
+      user_count = User.count
+      get :destroy, :id => users(:bob).id
+      assert_template 'destroy'
+      assert_valid assigns(:user)
+
+      assert_equal user_count, User.count
+      post :destroy, :id => users(:bob).id
+      assert_response :redirect, :action => 'list'
+      follow_redirect
+      assert_template 'index'
+      assert_equal user_count - 1, User.count
+    end
   end
 
-  def test_destroy
-    user_count = User.count
-    get :destroy, :id => users(:bob).id
-    assert_template 'destroy'
-    assert_valid assigns(:user)
+  describe 'when you are not admin' do
+
+    before :each do
+      session[:user] = users(:user_publisher).id
+    end
+
+    it "don't see the list of user" do
+      get :list
+      response.should redirect_to(:action => 'edit')
+    end
 
-    assert_equal user_count, User.count
-    post :destroy, :id => users(:bob).id
-    assert_response :redirect, :action => 'list'
-    follow_redirect
-    assert_template 'index'
-    assert_equal user_count - 1, User.count
+    it 'become a Typo admin' do
+      post :edit, :id => users(:user_publisher).id, :profile_id => profiles(:admin).id
+      response.should redirect_to(:action => 'list')
+    end
+    
+    it 'try update another user' do
+      post :edit, :id => users(:tobi).id, :profile_id => profiles(:contributor).id
+      response.should redirect_to(:action => 'list')
+      u = users(:tobi).reload
+      u.profile_id.should == profiles(:admin).id
+    end
   end
 end

data/spec/controllers/redirect_controller_spec.rb

@@ -10,26 +10,64 @@ describe RedirectController do
     request.relative_url_root = nil # avoid failures if environment.rb defines a relative URL root
   end
 
-  # Replace this with your real tests.
+  def test_routing_splits_path
+    assert_routing "foo/bar/baz", {
+      :from => ["foo", "bar", "baz"],
+      :controller => 'redirect', :action => 'redirect'}
+  end
+
   def test_redirect
-    get :redirect, :from => "foo/bar"
+    get :redirect, :from => ["foo", "bar"]
     assert_response 301
-    assert_response :redirect, "/someplace/else"
+    assert_redirected_to "http://test.host/someplace/else"
   end
 
   def test_url_root_redirect
     @request.relative_url_root = "/blog"
-    get :redirect, :from => "foo/bar"
+    get :redirect, :from => ["foo", "bar"]
     assert_response 301
-    assert_response :redirect, "/blog/someplace/else"
+    assert_redirected_to "http://test.host/blog/someplace/else"
 
-    get :redirect, :from => "bar/foo"
+    get :redirect, :from => ["bar", "foo"]
     assert_response 301
-    assert_response :redirect, "/blog/someplace/else"
+    assert_redirected_to "http://test.host/blog/someplace/else"
   end
 
   def test_no_redirect
-    get :redirect, :from => "something/that/isnt/there"
+    get :redirect, :from => ["something/that/isnt/there"]
     assert_response 404
   end
+
+  def test_redirect_articles
+    get :redirect, :from => ["articles", "foo", "bar", "baz"]
+    assert_response 301
+    assert_redirected_to "http://test.host/foo/bar/baz"
+  end
+
+  def test_redirect_articles_with_articles_in_path
+    get :redirect, :from => ["articles", "foo", "articles", "baz"]
+    assert_response 301
+    assert_redirected_to "http://test.host/foo/articles/baz"
+  end
+
+  def test_url_root_redirect_articles
+    @request.relative_url_root = "/blog"
+    get :redirect, :from => ["articles", "foo", "bar", "baz"]
+    assert_response 301
+    assert_redirected_to "http://test.host/blog/foo/bar/baz"
+  end
+
+  def test_url_root_redirect_articles_when_url_root_is_articles
+    @request.relative_url_root = "/articles"
+    get :redirect, :from => ["articles", "foo", "bar", "baz"]
+    assert_response 301
+    assert_redirected_to "http://test.host/articles/foo/bar/baz"
+  end
+
+  def test_url_root_redirect_articles_with_articles_in_url_root
+    @request.relative_url_root = "/aaa/articles/bbb"
+    get :redirect, :from => ["articles", "foo", "bar", "baz"]
+    assert_response 301
+    assert_redirected_to "http://test.host/aaa/articles/bbb/foo/bar/baz"
+  end
 end

data/spec/controllers/textfilter_controller_spec.rb

@@ -65,33 +65,6 @@ describe TextfilterController do
       filter_text('*"foo"*',[:doesntexist1,:markdown,"doesn't exist 2",:smartypants,:nopenotmeeither])
   end
 
-  def test_amazon
-    text = filter_text('<a href="amazon:097669400X" title="Rails">Rails book</a>',
-      [:amazon],
-      'amazon-associate-id' => 'scottstuff-20')
-    assert_equal "<a href=\"http://www.amazon.com/exec/obidos/ASIN/097669400X/scottstuff-20\" title=\"Rails\">Rails book</a>",
-      text
-    assert_equal %w{097669400X}, whiteboard[:asins]
-    reset_whiteboard
-
-    text = filter_text('[Rails book](amazon:097669400X)',
-      [:markdown,:amazon],
-      'amazon-associate-id' => 'scottstuff-20')
-    assert_equal "<p><a href=\"http://www.amazon.com/exec/obidos/ASIN/097669400X/scottstuff-20\">Rails book</a></p>",
-      text
-    assert_equal %w{097669400X}, whiteboard[:asins]
-    reset_whiteboard
-
-
-    text = filter_text("Foo\n\n[Rails book](amazon:097669400X)",
-      [:markdown,:amazon],
-      'amazon-associate-id' => 'scottstuff-20')
-    assert_equal "<p>Foo</p>\n\n<p><a href=\"http://www.amazon.com/exec/obidos/ASIN/097669400X/scottstuff-20\">Rails book</a></p>",
-          text
-    assert_equal %w{097669400X}, whiteboard[:asins]
-    reset_whiteboard
-  end
-
   def test_flickr
     assert_equal "<div style=\"float:left\" class=\"flickrplugin\"><a href=\"http://www.flickr.com/users/scottlaird/31366117\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_s.jpg\" width=\"75\" height=\"75\" alt=\"Matz\" title=\"Matz\"/></a><p class=\"caption\" style=\"width:75px\">This is Matz, Ruby's creator</p></div>",
       filter_text('<typo:flickr img="31366117" size="Square" style="float:left"/>',

data/spec/models/article_spec.rb

@@ -235,7 +235,7 @@ describe Article do
     assert_equal 0, Resource.find(:all, :conditions => "article_id = #{a.id}").size
   end
 
-  def test_notifications
+  it 'should notify' do
     a = Article.new(:title => 'New Article', :body => 'Foo', :author => 'Tobi', :user => users(:tobi))
     assert a.save
 

data/spec/models/text_filter_spec.rb

@@ -19,10 +19,6 @@ describe "With the list of available filters" do
     @filters.should include(Typo::Textfilter::Textile)
   end
 
-  it 'Amazon is available' do
-    @filters.should include(Typo::Textfilter::Amazon)
-  end
-
   it 'Flickr is available' do
     @filters.should include(Typo::Textfilter::Flickr)
   end

data/test/fixtures/profiles.yml

@@ -14,6 +14,8 @@ admin:
 publisher:
   label: publisher
   nicename: Blog publisher
+  modules:
+  - :users
 
 contributor:
   label: contributor

data/test/fixtures/users.yml

@@ -49,3 +49,14 @@ randomuser:
   notify_on_new_articles: true
   notify_on_comments: true
   profile: admin
+
+user_publisher:
+  login: shingara
+  password: 8e9b1a9a38e66ca572a5e8fdac8e256848842dfa # longtest
+  name: shingara
+  email: shingara@example.com
+  notify_via_email: false
+  notify_on_new_articles: false
+  notify_on_comments: false
+  profile: publisher
+