alchemy_cms 2.0.7 → 2.1.beta1

data/spec/controllers/admin/contents_controller_spec.rb

@@ -4,12 +4,12 @@ describe Admin::ContentsController do
 
 	before(:each) do
 		activate_authlogic
-		UserSession.create FactoryGirl.create(:admin_user)
+		UserSession.create Factory(:admin_user)
 	end
 
-	it "should update a content" do
-		FactoryGirl.create(:element)
-	  post :update, {:id => 1, :content => {:body => 'Peters Petshop'}}
+	it "should update a content via ajax" do
+		Factory(:element)
+		post :update, {:id => 1, :content => {:body => 'Peters Petshop'}, :format => :js}
 		Element.first.ingredient('intro').should == "Peters Petshop"
 	end
 

data/spec/controllers/admin/trash_controller_spec.rb

@@ -2,19 +2,16 @@ require 'spec_helper'
 
 describe Admin::TrashController do
 
+	render_views
+
 	before(:each) do
 		activate_authlogic
-		UserSession.create FactoryGirl.create(:admin_user)
+		UserSession.create Factory(:admin_user)
 	end
 
-	it "should hold trashed elements" do
-		pending "The controller behaves correct, the test not."
-		@page = FactoryGirl.create(:page, :parent_id => Page.rootpage.id)
-	  @element = FactoryGirl.create(:element, :page => @page)
-		# Rails, RSpec and co. are sucking
-		@element.reload
-		@element.trash
-		@element.reload
+	it "should hold trashed elements", :focus => true do
+		@page = Factory(:page, :parent_id => Page.rootpage.id)
+		@element = Factory(:element, :page => nil, :public => false, :position => 0, :folded => true)
 		get :index, :page_id => @page.id
 		response.body.should have_selector('#trash_items #element_4.element_editor')
 	end

data/spec/controllers/pages_controller_spec.rb

@@ -2,38 +2,39 @@ require 'spec_helper'
 
 describe PagesController do
 
+	render_views
+
 	before(:each) do
 		@default_language = Language.get_default
-		@default_language_root = FactoryGirl.create(:language_root_page, :language => @default_language, :name => 'Home', :public => true)
+		@default_language_root = Factory(:language_root_page, :language => @default_language, :name => 'Home', :public => true)
 	end
 
 	context "requested for a page containing a feed" do
 
 		before(:each) do
-			@page = FactoryGirl.create(:public_page, :parent_id => @default_language_root.id, :page_layout => 'news', :name => 'News', :language => @default_language)
+			@page = Factory(:public_page, :parent_id => @default_language_root.id, :page_layout => 'news', :name => 'News', :language => @default_language)
 		end
-
+		
 		it "should render a rss feed" do
 			get :show, :urlname => 'news', :format => :rss
 			response.content_type.should == 'application/rss+xml'
 		end
-
+	  
 		it "should include content" do
-			pending "I didn't figured out how to test XML response bodies"
 			@page.elements.first.content_by_name('news_headline').essence.update_attributes({:body => 'Peters Petshop'})
 			get :show, :urlname => 'news', :format => :rss
 			response.body.should match /Peters Petshop/
 		end
-
+	
 	end
 
 	context "requested for a page that does not contain a feed" do
-
+		
 		it "should render xml 404 error" do
 			get :show, :urlname => 'home', :format => :rss
 			response.status.should == 404
 		end
-
+		
 	end
 
 end

data/spec/dummy/Rakefile

@@ -1,7 +1,7 @@
+#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
-require 'rake'
 
 Dummy::Application.load_tasks

data/spec/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/spec/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,7 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require_tree . 
+*/

data/spec/dummy/app/views/layouts/application.html.erb

@@ -2,9 +2,9 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
-  <%= csrf_meta_tag %>
+  <%= stylesheet_link_tag    "application" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
 </head>
 <body>
 

data/spec/dummy/config/application.rb

@@ -1,10 +1,12 @@
 require File.expand_path('../boot', __FILE__)
 
-require "active_model/railtie"
-require "active_record/railtie"
+# Pick the frameworks you want:
+ require "active_record/railtie"
 require "action_controller/railtie"
-require "action_view/railtie"
 require "action_mailer/railtie"
+require "active_resource/railtie"
+require "sprockets/railtie"
+# require "rails/test_unit/railtie"
 
 Bundler.require
 require "alchemy_cms"
@@ -33,13 +35,17 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
-
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
   end
 end
+

data/spec/dummy/config/database.yml

@@ -1,5 +1,8 @@
 # SQLite version 3.x
 #   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
 development:
   adapter: sqlite3
   database: db/development.sqlite3

data/spec/dummy/config/environments/development.rb

@@ -3,7 +3,7 @@ Dummy::Application.configure do
 
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
@@ -11,7 +11,6 @@ Dummy::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
@@ -22,5 +21,10 @@ Dummy::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
-end
 
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end

data/spec/dummy/config/environments/production.rb

@@ -1,7 +1,6 @@
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
-  # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
 
@@ -9,14 +8,27 @@ Dummy::Application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+
+  # Generate digests for assets URLs
+  config.assets.digest = true
 
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+  # Defaults to Rails.root.join("public/assets")
+  # config.assets.manifest = YOUR_PATH
 
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
+  # Specifies the header that your server uses for sending files
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
 
   # See everything in the log (default is :info)
   # config.log_level = :debug
@@ -27,13 +39,12 @@ Dummy::Application.configure do
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
 
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-
-  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
+
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 

data/spec/dummy/config/environments/test.rb

@@ -7,7 +7,11 @@ Dummy::Application.configure do
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
 
   # Show full error reports and disable caching

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '1d681b0cf4a636962917a7ec5c29f3dda857a05b4e1b640f23663d77e47271f1aa75d3daac044ecb4e9a800f2e40b47c9cf94af9579ed72463ad2372fd038583'
+Dummy::Application.config.secret_token = 'b86ee13015fa1a1238276adbfe8af694f4c204777517b1aa3184c3610e01b3c83f1827363d448c1e8f71bc45ed05529771ef8518da574271fb07ab63dbb315ca'

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters :format => [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end

data/spec/dummy/config/locales/en.yml

@@ -1,5 +1,5 @@
 # Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
   hello: "Hello world"

data/spec/dummy/config/routes.rb

@@ -48,7 +48,7 @@ Dummy::Application.routes.draw do
 
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
-  # root :to => "welcome#index"
+  # root :to => 'welcome#index'
 
   # See how all your routes lay out with "rake routes"
 

data/spec/factories.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-
+	
 	factory :user do
 		email 'john@doe.com'
 		login "jdoe"
@@ -23,7 +23,7 @@ FactoryGirl.define do
   	end
 
 	end
-
+	
 	factory :language do
 		code "kl"
 		name 'Klingonian'
@@ -34,9 +34,9 @@ FactoryGirl.define do
 	end
 
 	factory :page do
-		language { Language.find_by_code('kl') || FactoryGirl.create(:language) }
+		language { Language.find_by_code('kl') || Factory(:language) }
 		name "A Page"
-		parent_id { FactoryGirl.create(:language_root_page).id }
+		parent_id { Factory(:language_root_page).id }
 		page_layout "standard"
 
     factory :language_root_page do
@@ -53,14 +53,14 @@ FactoryGirl.define do
 	  end
 
 	end
-
+	
 	factory :cell do
-		page { Page.find_by_language_root(true) || FactoryGirl.create(:language_root_page) }
+		page { Page.find_by_language_root(true) || Factory(:language_root_page) }
 		name "A Cell"
 	end
-
+	
 	factory :element do
 	  name 'article'
   end
-
+	
 end

data/spec/helpers/admin/elements_helper_spec.rb

@@ -5,8 +5,8 @@ include AlchemyHelper
 describe Admin::ElementsHelper do
 
 	before(:each) do
-		@page = FactoryGirl.create(:public_page)
-	  @element = FactoryGirl.create(:element, :page => @page)
+		@page = Factory(:public_page)
+	  @element = Factory(:element, :page => @page)
 	end
 
 	it "should render an element editor partial" do

data/spec/helpers/contents_helper_spec.rb

@@ -5,7 +5,7 @@ include AlchemyHelper
 describe ContentsHelper do
 
 	before(:each) do
-	  @element = FactoryGirl.create(:element)
+	  @element = Factory(:element)
 	end
 
   it "should render a dom id" do

data/spec/helpers/elements_helper_spec.rb

@@ -5,8 +5,8 @@ include AlchemyHelper
 describe ElementsHelper do
 
 	before(:each) do
-		@page = FactoryGirl.create(:public_page)
-	  @element = FactoryGirl.create(:element, :page => @page)
+		@page = Factory(:public_page)
+	  @element = Factory(:element, :page => @page)
 	end
 
   it "should render an element view partial" do
@@ -14,18 +14,18 @@ describe ElementsHelper do
   end
 
 	it "should render all elements" do
-		@another_element = FactoryGirl.create(:element)
+		@another_element = Factory(:element)
 		helper.stub!(:configuration).and_return(true)
 		helper.render_elements.should match(/id="header_3.+id="article_5"/)
-	end
+	end 
 
 	it "should render a unique dom id for element" do
 	  helper.element_dom_id(@element).should == "#{@element.name}_#{@element.id}"
 	end
 
 	it "should render elements for a cell" do
-		cell = FactoryGirl.create(:cell)
-		FactoryGirl.create(:element, :cell_id => cell.id)
+		cell = Factory(:cell)
+		Factory(:element, :cell_id => cell.id)
 		helper.stub(:configuration).and_return(true)
 	  helper.render_cell_elements(cell).should match(/id="article_7"/)
 	end

data/spec/helpers/essences_helper_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe EssencesHelper do
 
 	before(:each) do
-	  @element = FactoryGirl.create(:element)
+	  @element = Factory(:element)
 		@element.content_by_name('intro').essence.update_attributes(:body => 'hello!')
 	end