typo 5.2 → 5.2.98

data/public/stylesheets/growler.css

@@ -0,0 +1,216 @@
+ul.code {
+	background-color: #EEE;
+	border-left: 5px solid;
+	font-size: 12px;
+}
+ul.code li {
+	list-style-type: none;
+}
+td, th {
+	padding: 5px;
+	vertical-align: top;
+}
+th {
+	background-color: #9C0;
+	text-align: center;
+	font-weight: bold;
+}
+td.shaded {
+	background-color: #E8FCCF;
+}
+div.growlerexamples > div {
+	background-color: #EEE;
+	margin: 5px 0;
+	padding: 1px 5px;
+}
+div.growlerexamples div pre {
+
+}
+div.growlerexamples > div code {
+	margin-left: 20px;
+}
+div.growlerexamples span.runner {
+	color: #7090C0;
+	text-decoration: none;
+	border-bottom: 1px dotted;
+	font-weight: bold;
+	cursor: pointer;
+	margin-left: 5px;
+	font-size: .8em;
+}
+div.growlerexamples span:hover {
+
+}
+div#noticeevents {
+	border: 1px solid #999;
+}
+div#noticeevents div {
+	border-bottom: 1px dotted #DDD;
+	padding: 3px;
+	margin: 0px;
+}
+
+/** Growler Notice Custom Styling **/
+div.Growler-notice {
+	background-color: 		#000;
+	color: 					#fff;
+	opacity: 				.85;
+	filter: 				alpha(opacity = 85);
+	zoom: 					1;
+	width: 					235px;
+	padding: 				10px;
+	margin-top: 			5px;
+	margin-bottom: 			5px;
+	margin-left: 			auto;
+	margin-right: 			auto;
+	font-family: 			Tahoma, Arial, Helvetica, sans-serif;
+	font-size: 				12px;
+	text-align: 			left;
+	display: 				none;
+	-moz-border-radius: 	5px;
+	-webkit-border-radius:	5px;
+	min-height: 			40px;
+}
+
+div.Growler-notice-head {
+	font-weight: 			bold;
+	font-size:				10px;
+}
+
+div.Growler-notice-exit {
+	float: 					right;
+	font-weight: 			bold;
+	font-size: 				12px;
+	cursor:					pointer;
+}
+
+/** Plain Theme **/
+div.plain {
+	color: 					#000;
+	width: 					253px;
+	margin-top: 			5px;
+	margin-bottom: 			5px;
+	text-align: 			left;
+	display: 				none;
+	min-height: 			40px;
+	background-color: 		#EDEDED;
+	border: 				1px solid #777;
+}
+
+div.plain div.Growler-notice-head {
+	font-weight: 			bold;
+	font-size:				10px;
+	padding: 				2px 10px;
+}
+
+div.plain div.Growler-notice-exit {
+	float: 					right;
+	cursor:					pointer;
+	margin: 				0px;
+	padding: 				0px 0px 2px 2px;
+	width: 					10px;
+	height: 				10px;
+	color: 					#BFBFBF;
+}
+div.plain div.Growler-notice-body {
+	padding: 5px;
+}
+
+
+/** Mac OS X Theme **/
+div.macosx {
+	color: 					#000;
+	width: 					253px;
+	margin-top: 			5px;
+	margin-bottom: 			5px;
+	text-align: 			left;
+	display: 				none;
+	min-height: 			40px;
+	background: #d7d7d7 url(../images/macosx.jpg) repeat-y 0;
+	border: 				1px solid #C9C9C9;
+}
+
+div.macosx div.Growler-notice-head {
+	font-weight: 			bold;
+	font-size:				10px;
+	padding: 				5px 10px;
+}
+
+div.macosx div.Growler-notice-exit {
+	width: 					15px;
+	height: 				15px;
+	float: 					left;
+	cursor:					pointer;
+	margin: 				4px;
+	margin-left: 			1px;
+	font-size: 				0em;
+	color: 					transparent;
+	background: transparent url(../images/macosx_exit.png) no-repeat left 0;
+}
+div.macosx div.Growler-notice-exit:hover {
+	background: transparent url(../images/macosx_exit_over.png) no-repeat left 0;
+}
+div.macosx div.Growler-notice-body {
+	padding: 2px 0 10px 25px;
+}
+
+/** Candybars Theme **/
+div.candybar {
+	color: 					#000;
+	width: 					253px;
+	margin-top: 			5px;
+	margin-bottom: 			5px;
+	text-align: 			left;
+	display: 				none;
+	min-height: 			40px;
+	background-color: 		#F5F7FA;
+	border: 				1px solid #19304B;
+}
+
+div.candybar div.Growler-notice-head {
+	font-weight: 			bold;
+	font-size:				10px;
+	background: 			url(../images/candybars.jpg) repeat-x;
+	padding: 				5px 10px;
+}
+
+div.candybar div.Growler-notice-exit {
+	float: 					right;
+	cursor:					pointer;
+	margin: 				3px;
+}
+div.candybar div.Growler-notice-body {
+	border-top: 1px solid #999;
+	padding: 10px;
+}
+
+/** Construction Theme **/
+div.atwork {
+	color: 					#FFF;
+	width: 					253px;
+	margin-top: 			5px;
+	margin-bottom: 			5px;
+	text-align: 			left;
+	display: 				none;
+	min-height: 			40px;
+	background: 			#4d4d4d url(../images/atwork.png) repeat-y 0;
+	border: 				1px solid #222;
+}
+
+div.atwork div.Growler-notice-head {
+	font-weight: 			bold;
+	font-size:				12px;
+	padding: 				5px 20px;
+	color: 					#efca23;
+	
+}
+
+div.atwork div.Growler-notice-exit {
+	float: 					right;
+	cursor:					pointer;
+	margin: 				3px;
+}
+div.atwork div.Growler-notice-body {
+	padding: 2px 0 10px 25px;
+}
+

data/spec/controllers/accounts_controller_spec.rb

@@ -7,6 +7,7 @@ describe 'A successfully authenticated login' do
     @user = mock_model(User, :new_record? => false, :reload => @user)
     @user.stub!(:profile).and_return(Profile.find_by_label('admin'))
     User.stub!(:authenticate).and_return(@user)
+    User.stub!(:find_by_id).with(@user.id).and_return(@user)
     User.stub!(:count).and_return(1)
     controller.stub!(:this_blog).and_return(Blog.default)
   end
@@ -31,12 +32,57 @@ describe 'A successfully authenticated login' do
     make_request
     response.should redirect_to('/bogus/location')
   end
+  
+  it 'redirects to /admin if no return' do
+    make_request
+    response.should redirect_to(:controller => 'admin')
+  end
+
+  it 'redirects to /admin if no return and your are logged' do
+    session[:user_id] = session[:user] = @user.id
+    make_request
+    response.should redirect_to(:controller => 'admin')
+  end
 
   it "should redirect to signup if no users" do
     User.stub!(:count).and_return(0)
     make_request
     response.should redirect_to('/accounts/signup')
+  end  
+end
+
+describe 'User is inactive' do
+  controller_name :accounts
+
+  before(:each) do
+    User.stub!(:authenticate).and_return(nil)
+    User.stub!(:count).and_return(1)
   end
+ 
+  def make_request
+    post 'login', { :user_login => 'inactive', :password => 'longtest' } 
+  end
+  
+  it 'no user in goes in the session' do
+    make_request
+    response.session[:user_id].should be_nil
+  end
+  
+  it 'login should == "inactive"' do
+    make_request
+    assigns[:login].should == 'inactive'
+  end
+
+  it 'typo_user_profile cookie should be blank' do
+    make_request
+    cookies[:typo_user_profile].should be_blank
+  end
+
+  it 'should render login action' do
+    make_request
+    response.should render_template(:login)
+  end
+  
 end
 
 describe 'Login gets the wrong password' do
@@ -195,22 +241,29 @@ describe 'User is logged in' do
       .with(:first, :conditions => { :id => @user.id }) \
       .any_number_of_times \
       .and_return(@user)
-    @user.should_receive(:forget_me)
 
     cookies[:typo_user_profile] = 'admin'
   end
 
+  it 'trying to log in once again redirects to admin/dashboard/index' do
+    get 'login'
+    response.should redirect_to(:controller => 'admin')
+  end
+
   it 'logging out deletes the session[:user_id]' do
+    @user.should_receive(:forget_me)
     get 'logout'
     session[:user_id].should be_blank
   end
 
   it 'redirects to the login action' do
+    @user.should_receive(:forget_me)
     get 'logout'
     response.should redirect_to(:action => 'login')
   end
 
   it 'logging out deletes cookies containing credentials' do
+    @user.should_receive(:forget_me)
     get 'logout'
     cookies[:auth_token].should == []
     cookies[:typo_user_profile].should == []

data/spec/controllers/admin/cache_controller_spec.rb

@@ -11,15 +11,6 @@ describe Admin::CacheController, "rough port of the old functional test" do
     request.session = { :user => users(:tobi).id }
   end
 
-  describe 'sweep action' do
-
-    it 'should redirect to setting index' do
-      get 'sweep'
-      response.should redirect_to(:controller => '/admin/settings')
-    end
-
-  end
-
   describe 'sweep_html action' do
 
     it 'should redirect to setting index' do

data/spec/controllers/admin/content_controller_spec.rb

@@ -44,27 +44,21 @@ describe Admin::ContentController do
 
   end
 
-  describe 'show action', :shared => true do
-
-    it 'should render article' do
-      get :show, 'id' => contents(:article1).id
-      response.should render_template('show')
-      assert_template_has 'article'
-      assigns(:article).should be_valid
-      assigns(:article).should_not be_nil
+  describe 'insert_editor action' do
+    
+    before do
+      @user = users(:tobi)
+      request.session = { :user => @user.id }
+    end
+    
+    it 'should render _simple_editor' do
+      get(:insert_editor, :editor => 'simple')
+      response.should render_template('simple_editor')
     end
 
-    it 'show article with trigger' do
-      art = Article.create!(:title => 'future article',
-                            :body => 'content',
-                            :published_at => Time.now + 2.seconds,
-                            :published => true)
-      art.should_not be_published
-      get(:show, :id => art.id)
-      assigns(:article).should_not be_published
-      sleep 3
-      get(:show, :id => art.id)
-      assigns(:article).should be_published
+    it 'should render _visual_editor' do
+      get(:insert_editor, :editor => 'visual')
+      response.should render_template('visual_editor')
     end
 
   end
@@ -138,7 +132,7 @@ describe Admin::ContentController do
     end
 
     it 'should create a filtered article' do
-      body = "body via *textile*"
+      body = "body via *markdown*"
       extended="*foo*"
       post :new, 'article' => { :title => "another test", :body => body, :extended => extended}
       assert_response :redirect, :action => 'show'
@@ -146,9 +140,9 @@ describe Admin::ContentController do
       new_article = Article.find(:first, :order => "created_at DESC")
       assert_equal body, new_article.body
       assert_equal extended, new_article.extended
-      assert_equal "textile", new_article.text_filter.name
-      assert_equal "<p>body via <strong>textile</strong></p>", new_article.html(:body)
-      assert_equal "<p><strong>foo</strong></p>", new_article.html(:extended)
+      assert_equal "markdown", new_article.text_filter.name
+      assert_equal "<p>body via <em>markdown</em></p>", new_article.html(:body)
+      assert_equal "<p><em>foo</em></p>", new_article.html(:extended)
     end
 
   end
@@ -189,7 +183,6 @@ describe Admin::ContentController do
     end
 
     it_should_behave_like 'index action'
-    it_should_behave_like 'show action'
     it_should_behave_like 'new action'
     it_should_behave_like 'destroy action'
 
@@ -303,7 +296,6 @@ describe Admin::ContentController do
     end
 
     it_should_behave_like 'index action'
-    it_should_behave_like 'show action'
     it_should_behave_like 'new action'
     it_should_behave_like 'destroy action'
 

data/spec/controllers/admin/settings_controller_spec.rb

@@ -10,33 +10,76 @@ describe Admin::SettingsController do
     request.session = { :user => users(:tobi).id }
   end
 
-  def test_index
-    get :index
-    assert_template 'index'
+  describe "#index" do
+    it 'should render index' do
+      get :index
+      response.should render_template('index')
+    end
   end
   
-  def test_read
-    get :read
-    assert_template 'read'
+  describe 'read action' do
+    it 'should render read' do
+      get :read
+      assert_template 'read'
+    end
   end
+
+  describe 'write action' do
   
-  def test_write
-    get :write
-    assert_template 'write'
+    it 'should be success' do
+      get :write
+      assert_template 'write'
+    end
   end
   
-  def test_feedback
-    get :feedback
-    assert_template 'feedback'
+  describe 'feedback action' do
+    it 'should be sucess' do
+      get :feedback
+      assert_template 'feedback'
+    end
   end
   
-  def test_seo
-    get :seo
-    assert_template 'seo'
+  describe 'seo action' do 
+    it 'should be success' do
+      get :seo
+      assert_template 'seo'
+    end
   end
   
-  def test_redirect
-    get :redirect
-    assert_response :redirect, :controller => 'admin/settings', :action => 'index'
+  describe 'redirect action' do
+    it 'should be success' do
+      get :redirect
+      assert_response :redirect, :controller => 'admin/settings', :action => 'index'
+    end
+  end
+
+  describe 'update action' do
+
+    def good_update(options={})
+      post :update, {"from"=>"seo",
+        "authenticity_token"=>"f9ed457901b96c65e99ecb73991b694bd6e7c56b",
+        "setting"=>{"permalink_format"=>"/%title%.html",
+          "index_categories"=>"1",
+          "google_analytics"=>"",
+          "meta_keywords"=>"my keywords",
+          "meta_description"=>"",
+          "title_prefix"=>"1",
+          "rss_description"=>"1",
+          "robots"=>"User-agent: *\r\nDisallow: /admin/\r\nDisallow: /page/\r\nDisallow: /cgi-bin \r\nUser-agent: Googlebot-Image\r\nAllow: /*",
+          "index_tags"=>"1"}}.merge(options)
+    end
+
+    it 'should success' do
+      good_update
+      response.should redirect_to(:action => 'seo') 
+    end
+
+    it 'should not save blog with bad permalink format' do
+      @blog = Blog.default
+      good_update "setting" => {"permalink_format" => "title"}
+      response.should be_success
+      response.should render_template(:seo)
+      @blog.should == Blog.default
+    end
   end
 end