Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Trying to get combustion working. Close, but tests still won't run.

  • Loading branch information...
commit 10901dce84020422da6849f57b4c13bfbed20a5f 1 parent 13d09bf
@knewter knewter authored
View
2  Gemfile
@@ -14,6 +14,8 @@ end
group :development do
gem 'awesome_print', '~> 0.4.0', :require => 'ap'
gem 'rails_best_practices'
+ # Use combustion for testing the engine
+ gem 'combustion', '~> 0.3.1'
end
platforms :jruby do
View
139 Gemfile.lock
@@ -21,7 +21,7 @@ PATH
paper_trail (~> 2.6.0)
paperclip (~> 2.3)
rails (~> 3.2.8)
- rake (~> 0.9.2)
+ rake (~> 10.0)
sass-rails (~> 3.2.0)
sidekiq (= 2.0.3)
simple-navigation-bootstrap
@@ -32,31 +32,31 @@ GEM
remote: http://rubygems.org/
specs:
acl9 (0.12.0)
- actionmailer (3.2.8)
- actionpack (= 3.2.8)
+ actionmailer (3.2.9)
+ actionpack (= 3.2.9)
mail (~> 2.4.4)
- actionpack (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
+ actionpack (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.3)
- activemodel (3.2.8)
- activesupport (= 3.2.8)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
- activerecord (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
+ activerecord (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
- activesupport (3.2.8)
+ activeresource (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
+ activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
acts-as-taggable-on (2.2.2)
@@ -69,6 +69,8 @@ GEM
awesome_print (0.4.0)
bcrypt-ruby (3.0.1)
bootstrap-sass (2.0.1)
+ bourne (1.1.2)
+ mocha (= 0.10.5)
builder (3.0.4)
capistrano (2.8.0)
highline
@@ -76,7 +78,7 @@ GEM
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
- capybara (1.1.2)
+ capybara (1.1.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@@ -85,23 +87,26 @@ GEM
xpath (~> 0.1.4)
celluloid (0.11.1)
timers (>= 1.0.0)
- childprocess (0.3.4)
+ childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
- chunky_png (1.2.5)
- ci_reporter (1.7.0)
+ chunky_png (1.2.6)
+ ci_reporter (1.8.3)
builder (>= 2.1.2)
cocaine (0.4.2)
- code_analyzer (0.2.0)
+ code_analyzer (0.3.0)
sexp_processor
- coderay (1.0.7)
+ coderay (1.0.8)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.3)
+ coffee-script-source (1.4.0)
colored (1.2)
+ combustion (0.3.2)
+ rails (>= 3.0.0)
+ thor (>= 0.14.6)
compass (0.12.alpha.0)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
@@ -137,7 +142,7 @@ GEM
i18n (~> 0.4)
faraday (0.8.4)
multipart-post (~> 1.1)
- ffi (1.1.3)
+ ffi (1.2.0)
forgery (0.3.10)
nokogiri (~> 1.4)
fssm (0.2.9)
@@ -162,12 +167,13 @@ GEM
json (1.7.5)
jwt (0.1.5)
multi_json (>= 1.0)
- kramdown (0.14.0)
+ kramdown (0.14.1)
launchy (0.3.7)
configuration (>= 0.0.5)
rake (>= 0.8.1)
- libwebsocket (0.1.5)
+ libwebsocket (0.1.7.1)
addressable
+ websocket
macaddr (1.6.1)
systemu (~> 2.5.0)
machinist (1.0.6)
@@ -175,8 +181,11 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- method_source (0.8)
+ metaclass (0.0.1)
+ method_source (0.8.1)
mime-types (1.19)
+ mocha (0.10.5)
+ metaclass (~> 0.0.1)
multi_json (1.0.4)
multipart-post (1.1.5)
mysql2 (0.3.11)
@@ -184,7 +193,7 @@ GEM
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.6.1)
+ net-ssh (2.6.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
nokogiri (1.5.5)
@@ -195,7 +204,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.2)
orm_adapter (0.0.7)
- paper_trail (2.6.3)
+ paper_trail (2.6.4)
activerecord (~> 3.0)
railties (~> 3.0)
paperclip (2.8.0)
@@ -208,13 +217,13 @@ GEM
cucumber (>= 0.8)
rake
polyglot (0.3.3)
- progressbar (0.11.0)
+ progressbar (0.12.0)
pry (0.9.10)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.3.1)
- pry-rails (0.1.6)
- pry
+ pry-rails (0.2.2)
+ pry (>= 0.9.10)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
@@ -222,15 +231,15 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.8)
- actionmailer (= 3.2.8)
- actionpack (= 3.2.8)
- activerecord (= 3.2.8)
- activeresource (= 3.2.8)
- activesupport (= 3.2.8)
+ rails (3.2.9)
+ actionmailer (= 3.2.9)
+ actionpack (= 3.2.9)
+ activerecord (= 3.2.9)
+ activeresource (= 3.2.9)
+ activesupport (= 3.2.9)
bundler (~> 1.0)
- railties (= 3.2.8)
- rails_best_practices (1.11.1)
+ railties (= 3.2.9)
+ rails_best_practices (1.13.1)
activesupport
awesome_print
code_analyzer
@@ -238,46 +247,45 @@ GEM
erubis
i18n
progressbar
- railties (3.2.8)
- actionpack (= 3.2.8)
- activesupport (= 3.2.8)
+ railties (3.2.9)
+ actionpack (= 3.2.9)
+ activesupport (= 3.2.9)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
+ rake (10.0.2)
rdoc (3.12)
json (~> 1.4)
redis (3.0.2)
redis-namespace (1.2.1)
redis (~> 3.0.0)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.2)
+ rspec-core (2.12.1)
+ rspec-expectations (2.12.0)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.1)
- rspec-rails (2.11.0)
+ rspec-mocks (2.12.0)
+ rspec-rails (2.12.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.11.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
rubyzip (0.9.9)
- sass (3.1.20)
+ sass (3.2.3)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.25.0)
+ selenium-webdriver (2.27.1)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
- sexp_processor (4.0.1)
- shoulda-matchers (1.2.0)
+ sexp_processor (4.1.3)
+ shoulda-matchers (1.4.2)
activesupport (>= 3.0.0)
+ bourne (~> 1.1.2)
sidekiq (2.0.3)
celluloid (~> 0.11.0)
connection_pool (~> 0.9.0)
@@ -294,10 +302,11 @@ GEM
simplecov-html (0.5.3)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
- slop (3.3.2)
+ slop (3.3.3)
spork (0.9.0.rc9)
- sprockets (2.1.3)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
state_machine (1.0.3)
@@ -306,17 +315,18 @@ GEM
thor (0.16.0)
tilt (1.3.3)
timers (1.0.1)
- treetop (1.4.11)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
- uglifier (1.2.4)
+ tzinfo (0.3.35)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
- uuid (2.3.5)
+ multi_json (~> 1.0, >= 1.0.2)
+ uuid (2.3.6)
macaddr (~> 1.0)
warden (1.0.6)
rack (>= 1.0)
+ websocket (1.0.4)
xpath (0.1.4)
nokogiri (~> 1.3)
@@ -332,6 +342,7 @@ DEPENDENCIES
capybara (~> 1.1.1)
ci_reporter
coffee-rails (~> 3.2.0)
+ combustion (~> 0.3.1)
compass (= 0.12.alpha.0)
cucumber (~> 1.1.4)
cucumber-rails (~> 1.2.1)
View
2  Rakefile
@@ -2,7 +2,6 @@
# 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'
require 'rubygems'
@@ -10,4 +9,3 @@ begin
require 'ci/reporter/rake/rspec' # use this if you're using RSpec
rescue LoadError
end
-AssetTrackerTutorial::Application.load_tasks
View
3  app/helpers/xrono/application_helper.rb
@@ -1,5 +1,6 @@
+require 'acl9'
module Xrono::ApplicationHelper
- include Acl9Helpers
+ include ::Acl9::Helpers
def bootstrap_icon(name)
content_tag('i', nil, :class => "icon-#{name}")
View
9 config.ru
@@ -1,4 +1,7 @@
-# This file is used by Rack-based servers to start the application.
+require 'rubygems'
+require 'bundler'
-require ::File.expand_path('../config/environment', __FILE__)
-run AssetTrackerTutorial::Application
+Bundler.require :default, :development
+
+Combustion.initialize!
+run Combustion::Application
View
55 config/application.rb
@@ -1,55 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
-
-if defined?(Bundler)
- # If you precompile assets before deploying to production, use this line
- Bundler.require(*Rails.groups(:assets => %w(development test)))
- # If you want your assets lazily compiled in production, use this line
- # Bundler.require(:default, :assets, Rails.env)
-end
-
-module AssetTrackerTutorial
- class Application < Rails::Application
- # Settings in config/environments/* take precedence over those specified here.
- # Application configuration should go into files in config/initializers
- # -- all .rb files in that directory are automatically loaded.
-
- # Custom directories with classes and modules you want to be autoloadable.
- # config.autoload_paths += %W(#{config.root}/extras)
-
- # Only load the plugins named here, in the order given (default is alphabetical).
- # :all can be used as a placeholder for all plugins not explicitly named.
- # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
- # Activate observers that should always be running.
- # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
- # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
- # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
- config.time_zone = 'Central Time (US & Canada)'
-
- config.generators do |g|
- g.template_engine :haml
- g.test_framework :rspec, :fixture => false, :views => false, :controllers => false
- end
-
- # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
- # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
- # config.i18n.default_locale = :de
-
- # 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'
-
- config.assets.precompile += ['screen.css', 'add_taxonomy.js', 'specify_project.js', 'ticket_board.js', 'bootstrap-tabs.js', 'jquery.jeditable.js']
- end
-end
View
14 spec/internal/config/database.yml
@@ -0,0 +1,14 @@
+production:
+ adapter: postgresql
+ database: xrono_production
+
+development:
+ adapter: postgresql
+ database: xrono_development
+
+test: &test
+ adapter: postgresql
+ database: xrono_test
+
+cucumber:
+ <<: *test
View
0  config/database.yml.example → spec/internal/config/database.yml.example
File renamed without changes
View
0  config/database.yml.mysql → spec/internal/config/database.yml.mysql
File renamed without changes
View
0  config/database.yml.mysql.jruby → spec/internal/config/database.yml.mysql.jruby
File renamed without changes
View
0  config/database.yml.postgres → spec/internal/config/database.yml.postgres
File renamed without changes
View
0  config/database.yml.postgres.jruby → spec/internal/config/database.yml.postgres.jruby
File renamed without changes
View
3  spec/internal/config/routes.rb
@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+ mount Xrono, at: '/'
+end
View
0  db/schema.rb → spec/internal/db/schema.rb
File renamed without changes
View
1  spec/internal/log/.gitignore
@@ -0,0 +1 @@
+*.log
View
0  spec/internal/public/favicon.ico
No changes.
View
7 spec/spec_helper.rb
@@ -13,8 +13,13 @@
# need to restart spork for it take effect.
# This file is copied to spec/ when you run 'rails generate rspec:install'
ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
+
+require 'xrono'
+require 'combustion'
+Combustion.initialize!
+
require File.expand_path(File.dirname(__FILE__) + "/blueprints")
+
require 'rspec/rails'
require 'devise/test_helpers'
Please sign in to comment.
Something went wrong with that request. Please try again.