From f9ecff3dc3e3ab0f6e3d58b42fb5b2ffa497ea34 Mon Sep 17 00:00:00 2001 From: Will Read Date: Wed, 28 Dec 2011 15:45:07 -0800 Subject: [PATCH] use rspec for specs, moved dummy app --- .gitignore | 7 +++--- Gemfile | 3 +++ Gemfile.lock | 22 ++++++++++++++++--- Rakefile | 10 ++++----- script/rails | 2 +- {test => spec}/dummy/Rakefile | 0 .../app/assets/javascripts/application.js | 0 .../app/assets/stylesheets/application.css | 0 .../app/controllers/application_controller.rb | 0 .../dummy/app/helpers/application_helper.rb | 0 {test => spec}/dummy/app/mailers/.gitkeep | 0 {test => spec}/dummy/app/models/.gitkeep | 0 .../app/views/layouts/application.html.erb | 0 .../whurl_engine/application.html.haml | 0 {test => spec}/dummy/config.ru | 0 {test => spec}/dummy/config/application.rb | 0 {test => spec}/dummy/config/boot.rb | 0 .../dummy/config/database.sample.yml | 0 {test => spec}/dummy/config/database.yml | 0 {test => spec}/dummy/config/environment.rb | 0 .../dummy/config/environments/development.rb | 0 .../dummy/config/environments/production.rb | 0 .../dummy/config/environments/test.rb | 2 +- .../initializers/backtrace_silencers.rb | 0 .../dummy/config/initializers/inflections.rb | 0 .../dummy/config/initializers/mime_types.rb | 0 .../dummy/config/initializers/secret_token.rb | 0 .../config/initializers/session_store.rb | 0 .../config/initializers/wrap_parameters.rb | 0 {test => spec}/dummy/config/locales/en.yml | 0 {test => spec}/dummy/config/routes.rb | 0 {test => spec}/dummy/db/schema.rb | 0 {test => spec}/dummy/lib/assets/.gitkeep | 0 {test => spec}/dummy/log/.gitkeep | 0 {test => spec}/dummy/public/404.html | 0 {test => spec}/dummy/public/422.html | 0 {test => spec}/dummy/public/500.html | 0 {test => spec}/dummy/public/favicon.ico | 0 {test => spec}/dummy/script/rails | 0 .../fixtures/whurl_engine/whurl_requests.yml | 0 .../whurl_engine/api_call_controller_test.rb | 0 {test => spec}/integration/navigation_test.rb | 0 spec/spec_helper.rb | 14 ++++++++++++ .../whurl_engine/api_call_helper_test.rb | 0 .../unit/whurl_engine/whurl_request_test.rb | 0 test/test_helper.rb | 10 --------- test/whurl_engine_test.rb | 7 ------ 47 files changed, 47 insertions(+), 30 deletions(-) rename {test => spec}/dummy/Rakefile (100%) rename {test => spec}/dummy/app/assets/javascripts/application.js (100%) rename {test => spec}/dummy/app/assets/stylesheets/application.css (100%) rename {test => spec}/dummy/app/controllers/application_controller.rb (100%) rename {test => spec}/dummy/app/helpers/application_helper.rb (100%) rename {test => spec}/dummy/app/mailers/.gitkeep (100%) rename {test => spec}/dummy/app/models/.gitkeep (100%) rename {test => spec}/dummy/app/views/layouts/application.html.erb (100%) rename {test => spec}/dummy/app/views/layouts/whurl_engine/application.html.haml (100%) rename {test => spec}/dummy/config.ru (100%) rename {test => spec}/dummy/config/application.rb (100%) rename {test => spec}/dummy/config/boot.rb (100%) rename {test => spec}/dummy/config/database.sample.yml (100%) rename {test => spec}/dummy/config/database.yml (100%) rename {test => spec}/dummy/config/environment.rb (100%) rename {test => spec}/dummy/config/environments/development.rb (100%) rename {test => spec}/dummy/config/environments/production.rb (100%) rename {test => spec}/dummy/config/environments/test.rb (97%) rename {test => spec}/dummy/config/initializers/backtrace_silencers.rb (100%) rename {test => spec}/dummy/config/initializers/inflections.rb (100%) rename {test => spec}/dummy/config/initializers/mime_types.rb (100%) rename {test => spec}/dummy/config/initializers/secret_token.rb (100%) rename {test => spec}/dummy/config/initializers/session_store.rb (100%) rename {test => spec}/dummy/config/initializers/wrap_parameters.rb (100%) rename {test => spec}/dummy/config/locales/en.yml (100%) rename {test => spec}/dummy/config/routes.rb (100%) rename {test => spec}/dummy/db/schema.rb (100%) rename {test => spec}/dummy/lib/assets/.gitkeep (100%) rename {test => spec}/dummy/log/.gitkeep (100%) rename {test => spec}/dummy/public/404.html (100%) rename {test => spec}/dummy/public/422.html (100%) rename {test => spec}/dummy/public/500.html (100%) rename {test => spec}/dummy/public/favicon.ico (100%) rename {test => spec}/dummy/script/rails (100%) rename {test => spec}/fixtures/whurl_engine/whurl_requests.yml (100%) rename {test => spec}/functional/whurl_engine/api_call_controller_test.rb (100%) rename {test => spec}/integration/navigation_test.rb (100%) create mode 100644 spec/spec_helper.rb rename {test => spec}/unit/helpers/whurl_engine/api_call_helper_test.rb (100%) rename {test => spec}/unit/whurl_engine/whurl_request_test.rb (100%) delete mode 100644 test/test_helper.rb delete mode 100644 test/whurl_engine_test.rb diff --git a/.gitignore b/.gitignore index d1cb6cd..e0f56cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,10 @@ .bundle/ log/*.log pkg/ -test/dummy/db/*.sqlite3 -test/dummy/log/*.log -test/dummy/tmp/ +test +spec/dummy/db/*.sqlite3 +spec/dummy/log/*.log +spec/dummy/tmp/ .idea/* config/database.yml tmp diff --git a/Gemfile b/Gemfile index 761f9bf..5e856b7 100644 --- a/Gemfile +++ b/Gemfile @@ -8,3 +8,6 @@ gemspec # jquery-rails is used by the dummy application gem "jquery-rails" +gem 'rspec', '~> 2.7.0' +gem 'rspec-rails', '~> 2.7.0' + diff --git a/Gemfile.lock b/Gemfile.lock index bbdb94c..8700272 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,11 +45,12 @@ GEM addressable (2.2.6) arel (2.2.1) builder (3.0.0) - coderay (0.9.6) + coderay (0.9.8) coffee-script (2.2.0) coffee-script-source execjs coffee-script-source (1.2.0) + diff-lcs (1.1.3) erubis (2.7.0) execjs (1.2.13) multi_json (~> 1.0) @@ -60,7 +61,7 @@ GEM rubyzip term-ansicolor (~> 1.0.5) hike (1.2.1) - httmultiparty (0.2) + httmultiparty (0.3.6) httparty (>= 0.7.3) multipart-post httparty (0.8.1) @@ -112,6 +113,19 @@ GEM json (~> 1.4) rest-client (1.6.7) mime-types (>= 1.16) + rspec (2.7.0) + rspec-core (~> 2.7.0) + rspec-expectations (~> 2.7.0) + rspec-mocks (~> 2.7.0) + rspec-core (2.7.1) + rspec-expectations (2.7.0) + diff-lcs (~> 1.1.2) + rspec-mocks (2.7.0) + rspec-rails (2.7.0) + actionpack (~> 3.0) + activesupport (~> 3.0) + railties (~> 3.0) + rspec (~> 2.7.0) rubyzip (0.9.5) sass (3.1.12) sprockets (2.0.3) @@ -125,7 +139,7 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.31) - uglifier (1.2.0) + uglifier (1.2.1) execjs (>= 0.3.0) multi_json (>= 1.0.2) @@ -136,4 +150,6 @@ DEPENDENCIES heroku jquery-rails mysql (~> 2.8.1) + rspec (~> 2.7.0) + rspec-rails (~> 2.7.0) whurl_engine! diff --git a/Rakefile b/Rakefile index 0880d67..75e18a9 100644 --- a/Rakefile +++ b/Rakefile @@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc| rdoc.rdoc_files.include('lib/**/*.rb') end -APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__) +APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__) load 'rails/tasks/engine.rake' @@ -28,12 +28,12 @@ Bundler::GemHelper.install_tasks require 'rake/testtask' -Rake::TestTask.new(:test) do |t| +Rake::TestTask.new(:spec) do |t| t.libs << 'lib' - t.libs << 'test' - t.pattern = 'test/**/*_test.rb' + t.libs << 'spec' + t.pattern = 'spec/**/*_spec.rb' t.verbose = false end -task :default => :test +task :default => :spec diff --git a/script/rails b/script/rails index e323e44..4309856 100755 --- a/script/rails +++ b/script/rails @@ -3,4 +3,4 @@ # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. ENGINE_PATH = File.expand_path('../..', __FILE__) -load File.expand_path('../../test/dummy/script/rails', __FILE__) +load File.expand_path('../../spec/dummy/script/rails', __FILE__) diff --git a/test/dummy/Rakefile b/spec/dummy/Rakefile similarity index 100% rename from test/dummy/Rakefile rename to spec/dummy/Rakefile diff --git a/test/dummy/app/assets/javascripts/application.js b/spec/dummy/app/assets/javascripts/application.js similarity index 100% rename from test/dummy/app/assets/javascripts/application.js rename to spec/dummy/app/assets/javascripts/application.js diff --git a/test/dummy/app/assets/stylesheets/application.css b/spec/dummy/app/assets/stylesheets/application.css similarity index 100% rename from test/dummy/app/assets/stylesheets/application.css rename to spec/dummy/app/assets/stylesheets/application.css diff --git a/test/dummy/app/controllers/application_controller.rb b/spec/dummy/app/controllers/application_controller.rb similarity index 100% rename from test/dummy/app/controllers/application_controller.rb rename to spec/dummy/app/controllers/application_controller.rb diff --git a/test/dummy/app/helpers/application_helper.rb b/spec/dummy/app/helpers/application_helper.rb similarity index 100% rename from test/dummy/app/helpers/application_helper.rb rename to spec/dummy/app/helpers/application_helper.rb diff --git a/test/dummy/app/mailers/.gitkeep b/spec/dummy/app/mailers/.gitkeep similarity index 100% rename from test/dummy/app/mailers/.gitkeep rename to spec/dummy/app/mailers/.gitkeep diff --git a/test/dummy/app/models/.gitkeep b/spec/dummy/app/models/.gitkeep similarity index 100% rename from test/dummy/app/models/.gitkeep rename to spec/dummy/app/models/.gitkeep diff --git a/test/dummy/app/views/layouts/application.html.erb b/spec/dummy/app/views/layouts/application.html.erb similarity index 100% rename from test/dummy/app/views/layouts/application.html.erb rename to spec/dummy/app/views/layouts/application.html.erb diff --git a/test/dummy/app/views/layouts/whurl_engine/application.html.haml b/spec/dummy/app/views/layouts/whurl_engine/application.html.haml similarity index 100% rename from test/dummy/app/views/layouts/whurl_engine/application.html.haml rename to spec/dummy/app/views/layouts/whurl_engine/application.html.haml diff --git a/test/dummy/config.ru b/spec/dummy/config.ru similarity index 100% rename from test/dummy/config.ru rename to spec/dummy/config.ru diff --git a/test/dummy/config/application.rb b/spec/dummy/config/application.rb similarity index 100% rename from test/dummy/config/application.rb rename to spec/dummy/config/application.rb diff --git a/test/dummy/config/boot.rb b/spec/dummy/config/boot.rb similarity index 100% rename from test/dummy/config/boot.rb rename to spec/dummy/config/boot.rb diff --git a/test/dummy/config/database.sample.yml b/spec/dummy/config/database.sample.yml similarity index 100% rename from test/dummy/config/database.sample.yml rename to spec/dummy/config/database.sample.yml diff --git a/test/dummy/config/database.yml b/spec/dummy/config/database.yml similarity index 100% rename from test/dummy/config/database.yml rename to spec/dummy/config/database.yml diff --git a/test/dummy/config/environment.rb b/spec/dummy/config/environment.rb similarity index 100% rename from test/dummy/config/environment.rb rename to spec/dummy/config/environment.rb diff --git a/test/dummy/config/environments/development.rb b/spec/dummy/config/environments/development.rb similarity index 100% rename from test/dummy/config/environments/development.rb rename to spec/dummy/config/environments/development.rb diff --git a/test/dummy/config/environments/production.rb b/spec/dummy/config/environments/production.rb similarity index 100% rename from test/dummy/config/environments/production.rb rename to spec/dummy/config/environments/production.rb diff --git a/test/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb similarity index 97% rename from test/dummy/config/environments/test.rb rename to spec/dummy/config/environments/test.rb index 6810c91..fdf2331 100644 --- a/test/dummy/config/environments/test.rb +++ b/spec/dummy/config/environments/test.rb @@ -27,7 +27,7 @@ # Tell Action Mailer not to deliver emails to the real world. # The :test delivery method accumulates sent emails in the # ActionMailer::Base.deliveries array. - config.action_mailer.delivery_method = :test + config.action_mailer.delivery_method = :spec # Use SQL instead of Active Record's schema dumper when creating the test database. # This is necessary if your schema can't be completely dumped by the schema dumper, diff --git a/test/dummy/config/initializers/backtrace_silencers.rb b/spec/dummy/config/initializers/backtrace_silencers.rb similarity index 100% rename from test/dummy/config/initializers/backtrace_silencers.rb rename to spec/dummy/config/initializers/backtrace_silencers.rb diff --git a/test/dummy/config/initializers/inflections.rb b/spec/dummy/config/initializers/inflections.rb similarity index 100% rename from test/dummy/config/initializers/inflections.rb rename to spec/dummy/config/initializers/inflections.rb diff --git a/test/dummy/config/initializers/mime_types.rb b/spec/dummy/config/initializers/mime_types.rb similarity index 100% rename from test/dummy/config/initializers/mime_types.rb rename to spec/dummy/config/initializers/mime_types.rb diff --git a/test/dummy/config/initializers/secret_token.rb b/spec/dummy/config/initializers/secret_token.rb similarity index 100% rename from test/dummy/config/initializers/secret_token.rb rename to spec/dummy/config/initializers/secret_token.rb diff --git a/test/dummy/config/initializers/session_store.rb b/spec/dummy/config/initializers/session_store.rb similarity index 100% rename from test/dummy/config/initializers/session_store.rb rename to spec/dummy/config/initializers/session_store.rb diff --git a/test/dummy/config/initializers/wrap_parameters.rb b/spec/dummy/config/initializers/wrap_parameters.rb similarity index 100% rename from test/dummy/config/initializers/wrap_parameters.rb rename to spec/dummy/config/initializers/wrap_parameters.rb diff --git a/test/dummy/config/locales/en.yml b/spec/dummy/config/locales/en.yml similarity index 100% rename from test/dummy/config/locales/en.yml rename to spec/dummy/config/locales/en.yml diff --git a/test/dummy/config/routes.rb b/spec/dummy/config/routes.rb similarity index 100% rename from test/dummy/config/routes.rb rename to spec/dummy/config/routes.rb diff --git a/test/dummy/db/schema.rb b/spec/dummy/db/schema.rb similarity index 100% rename from test/dummy/db/schema.rb rename to spec/dummy/db/schema.rb diff --git a/test/dummy/lib/assets/.gitkeep b/spec/dummy/lib/assets/.gitkeep similarity index 100% rename from test/dummy/lib/assets/.gitkeep rename to spec/dummy/lib/assets/.gitkeep diff --git a/test/dummy/log/.gitkeep b/spec/dummy/log/.gitkeep similarity index 100% rename from test/dummy/log/.gitkeep rename to spec/dummy/log/.gitkeep diff --git a/test/dummy/public/404.html b/spec/dummy/public/404.html similarity index 100% rename from test/dummy/public/404.html rename to spec/dummy/public/404.html diff --git a/test/dummy/public/422.html b/spec/dummy/public/422.html similarity index 100% rename from test/dummy/public/422.html rename to spec/dummy/public/422.html diff --git a/test/dummy/public/500.html b/spec/dummy/public/500.html similarity index 100% rename from test/dummy/public/500.html rename to spec/dummy/public/500.html diff --git a/test/dummy/public/favicon.ico b/spec/dummy/public/favicon.ico similarity index 100% rename from test/dummy/public/favicon.ico rename to spec/dummy/public/favicon.ico diff --git a/test/dummy/script/rails b/spec/dummy/script/rails similarity index 100% rename from test/dummy/script/rails rename to spec/dummy/script/rails diff --git a/test/fixtures/whurl_engine/whurl_requests.yml b/spec/fixtures/whurl_engine/whurl_requests.yml similarity index 100% rename from test/fixtures/whurl_engine/whurl_requests.yml rename to spec/fixtures/whurl_engine/whurl_requests.yml diff --git a/test/functional/whurl_engine/api_call_controller_test.rb b/spec/functional/whurl_engine/api_call_controller_test.rb similarity index 100% rename from test/functional/whurl_engine/api_call_controller_test.rb rename to spec/functional/whurl_engine/api_call_controller_test.rb diff --git a/test/integration/navigation_test.rb b/spec/integration/navigation_test.rb similarity index 100% rename from test/integration/navigation_test.rb rename to spec/integration/navigation_test.rb diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb new file mode 100644 index 0000000..a1f8e26 --- /dev/null +++ b/spec/spec_helper.rb @@ -0,0 +1,14 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../dummy/config/environment.rb", __FILE__) + +require 'rspec/rails' + +ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../') + +# Requires supporting ruby files with custom matchers and macros, etc, +# in spec/support/ and its subdirectories. +Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f } + +RSpec.configure do |config| + config.use_transactional_fixtures = true +end \ No newline at end of file diff --git a/test/unit/helpers/whurl_engine/api_call_helper_test.rb b/spec/unit/helpers/whurl_engine/api_call_helper_test.rb similarity index 100% rename from test/unit/helpers/whurl_engine/api_call_helper_test.rb rename to spec/unit/helpers/whurl_engine/api_call_helper_test.rb diff --git a/test/unit/whurl_engine/whurl_request_test.rb b/spec/unit/whurl_engine/whurl_request_test.rb similarity index 100% rename from test/unit/whurl_engine/whurl_request_test.rb rename to spec/unit/whurl_engine/whurl_request_test.rb diff --git a/test/test_helper.rb b/test/test_helper.rb deleted file mode 100644 index dcd3b27..0000000 --- a/test/test_helper.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Configure Rails Environment -ENV["RAILS_ENV"] = "test" - -require File.expand_path("../dummy/config/environment.rb", __FILE__) -require "rails/test_help" - -Rails.backtrace_cleaner.remove_silencers! - -# Load support files -Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f } diff --git a/test/whurl_engine_test.rb b/test/whurl_engine_test.rb deleted file mode 100644 index 132dba0..0000000 --- a/test/whurl_engine_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class WhurlEngineTest < ActiveSupport::TestCase - test "truth" do - assert_kind_of Module, WhurlEngine - end -end