Permalink
Browse files

moved test app

  • Loading branch information...
1 parent aeb0a3b commit 02bd7859e09d723798817243640f2e3cd5cc4e71 @jbasdf jbasdf committed Nov 18, 2010
Showing 1,984 changed files with 2,367 additions and 2,268 deletions.
View
@@ -29,4 +29,5 @@ pkg/*
log/*
global_config.yml
test/rails_root/config/initializers/oauth_consumers.rb
-secrets.yml
+secrets.yml
+test/log/*
View
@@ -1,12 +1,13 @@
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
desc 'Default: run specs.'
task :default => :spec
-Spec::Rake::SpecTask.new('spec') do |t|
- t.spec_files = FileList['test/rails_test/spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec) do |t|
+ t.rspec_opts = ["--color", "-c", "-f progress", "-r test/spec/spec_helper.rb"]
+ t.pattern = 'test/spec/**/*_spec.rb'
end
begin
@@ -17,7 +18,7 @@ begin
gem.description = %Q{A simple wrapper for the oauth and oauth-plugin gems so that it is faster to include oauth in muck based applications.}
gem.email = "justin@tatemae.com"
gem.homepage = "http://github.com/tatemae/muck-oauth"
- gem.rubyforge_project = "muck-oauth"
+
gem.authors = ["Justin Ball"]
gem.add_dependency "oauth", '>= 0.3.6'
gem.add_dependency "oauth-plugin", '~> 0.3.14'
@@ -27,6 +28,8 @@ begin
gem.add_dependency "muck-engine"
gem.add_dependency "muck-users"
gem.add_development_dependency "babelphish"
+ gem.files.exclude 'test/**'
+ gem.test_files.exclude 'test/**'
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
end
Jeweler::GemcutterTasks.new
@@ -38,8 +41,8 @@ begin
require 'rcov/rcovtask'
Rcov::RcovTask.new do |t|
#t.libs << 'lib'
- t.libs << 'test/rails_test/lib'
- t.pattern = 'test/rails_test/test/**/*_test.rb'
+ t.libs << 'test/lib'
+ t.pattern = 'test/test/**/*_spec.rb'
t.verbose = true
t.output_dir = 'coverage'
t.rcov_opts << '--exclude "gems/*"'
@@ -1,4 +1,4 @@
-<%= error_messages_for :client_application %>
+<%= output_errors('', {:class => 'help-box'}, :client_application) %>
<div class="field">
<label for="client_application_name"><%=translate('muck.oauth.name_label') %></label><br/>
<%= f.text_field :name %>
View
@@ -1,31 +0,0 @@
-require 'rake'
-require 'rake/tasklib'
-require 'fileutils'
-
-module MuckOauth
- class Tasks < ::Rake::TaskLib
- def initialize
- define
- end
-
- private
- def define
-
- namespace :muck do
- namespace :sync do
- desc "Sync required files from muck oauth."
- task :oauth do
- path = File.join(File.dirname(__FILE__), *%w[.. ..])
- system "rsync -ruv #{path}/db ."
- #system "rsync -ruv #{path}/public ."
- if !File.exists?('./config/initializers/oauth_consumers.rb')
- system "rsync -ruv #{path}/config/initializers/oauth_consumers.rb ./config/initializers/oauth_consumers.rb"
- end
- end
- end
- end
-
- end
- end
-end
-MuckOauth::Tasks.new
View
@@ -0,0 +1,15 @@
+require 'fileutils'
+
+namespace :muck do
+ namespace :sync do
+ desc "Sync required files from muck oauth."
+ task :oauth do
+ path = File.join(File.dirname(__FILE__), *%w[.. ..])
+ system "rsync -ruv #{path}/db ."
+ #system "rsync -ruv #{path}/public ."
+ if !File.exists?('./config/initializers/oauth_consumers.rb')
+ system "rsync -ruv #{path}/config/initializers/oauth_consumers.rb ./config/initializers/oauth_consumers.rb"
+ end
+ end
+ end
+end
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,6 +1,6 @@
source "http://rubygems.org"
-gem "rails", "3.0.0"
+gem "rails", "3.0.1"
gem 'mysql'
# gem 'authlogic'
@@ -23,26 +23,26 @@ gem 'portablecontacts'
gem 'muck-engine', :path => "~/projects/muck-engine"
gem 'muck-users', :path => "~/projects/muck-users"
-gem 'muck-oauth', :path => '../../'
+gem 'muck-oauth', :path => '../'
if RUBY_VERSION < '1.9'
gem "ruby-debug"
end
group :test, :development do
- gem "rspec-rails", ">=2.0.0.beta.22"
+ gem "rspec-rails", ">=2.1.0"
gem "cucumber-rails"
end
group :test do
gem "autotest"
gem "capybara", ">= 0.3.9"
# this is also temporary until shoulda works with Rails 3. Local version includes this fix: http://github.com/dchelimsky/shoulda/commit/586b2d90e277c11f951180a203cc92292ff01026
- gem "shoulda", :path => "~/projects/other_apps/shoulda"
+ gem "shoulda"
gem "factory_girl"
gem "cucumber"
gem "rcov"
- gem "rspec", ">=2.0.0.beta.22"
+ gem "rspec", ">=2.1.0"
gem "database_cleaner"
gem "spork"
gem "launchy"
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,15 @@
+class ApplicationController < ActionController::Base
+
+ helper :all
+ protect_from_forgery
+
+ layout 'default'
+
+ protected
+ # called by Admin::Muck::BaseController to check whether or not the
+ # user should have access to the admin UI
+ def admin_access?
+ admin?
+ end
+
+end
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.

0 comments on commit 02bd785

Please sign in to comment.