lib/tasks/rspec.rake script/autospec vendor/plugins/calendar_date_select/.gitignore vendor/plugins/calendar_date_select/History.txt vendor/plugins/calendar_date_select/Manifest.txt vendor/plugins/calendar_date_select/Rakefile vendor/plugins/calendar_date_select/Readme.txt vendor/plugins/calendar_date_select/calendar_date_select.gemspec vendor/plugins/calendar_date_select/js_test/functional/.tmp_cds_test.html vendor/plugins/calendar_date_select/lib/calendar_date_select/calendar_date_select.rb vendor/plugins/calendar_date_select/lib/calendar_date_select/form_helpers.rb vendor/plugins/calendar_date_select/lib/calendar_date_select/includes_helper.rb vendor/plugins/calendar_date_select/public/blank_iframe.html vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_db.js vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_euro_24hr_ymd.js vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_iso_date.js vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/de.js vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/fr.js vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/pl.js vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/pt.js vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/ru.js vendor/plugins/calendar_date_select/spec/calendar_date_select/calendar_date_select_spec.rb vendor/plugins/calendar_date_select/spec/calendar_date_select/form_helpers_spec.rb vendor/plugins/calendar_date_select/spec/spec_helper.rb vendor/plugins/has_many_polymorphs/CHANGELOG vendor/plugins/has_many_polymorphs/LICENSE vendor/plugins/has_many_polymorphs/Manifest vendor/plugins/has_many_polymorphs/README vendor/plugins/has_many_polymorphs/Rakefile vendor/plugins/has_many_polymorphs/TODO vendor/plugins/has_many_polymorphs/examples/hmph.rb vendor/plugins/has_many_polymorphs/generators/tagging/tagging_generator.rb vendor/plugins/has_many_polymorphs/generators/tagging/templates/migration.rb vendor/plugins/has_many_polymorphs/generators/tagging/templates/tag.rb vendor/plugins/has_many_polymorphs/generators/tagging/templates/tag_test.rb vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging.rb vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging_extensions.rb vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging_test.rb vendor/plugins/has_many_polymorphs/generators/tagging/templates/taggings.yml vendor/plugins/has_many_polymorphs/generators/tagging/templates/tags.yml vendor/plugins/has_many_polymorphs/init.rb vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs.rb vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/association.rb vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/autoload.rb vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/base.rb vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/class_methods.rb vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/configuration.rb vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/debugging_tools.rb vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/rake_task_redefine_task.rb vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/reflection.rb vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/support_methods.rb vendor/plugins/has_many_polymorphs/test/fixtures/bow_wows.yml vendor/plugins/has_many_polymorphs/test/fixtures/cats.yml vendor/plugins/has_many_polymorphs/test/fixtures/eaters_foodstuffs.yml vendor/plugins/has_many_polymorphs/test/fixtures/fish.yml vendor/plugins/has_many_polymorphs/test/fixtures/frogs.yml vendor/plugins/has_many_polymorphs/test/fixtures/keep_your_enemies_close.yml vendor/plugins/has_many_polymorphs/test/fixtures/little_whale_pupils.yml vendor/plugins/has_many_polymorphs/test/fixtures/people.yml vendor/plugins/has_many_polymorphs/test/fixtures/petfoods.yml vendor/plugins/has_many_polymorphs/test/fixtures/whales.yml vendor/plugins/has_many_polymorphs/test/fixtures/wild_boars.yml vendor/plugins/has_many_polymorphs/test/generator/tagging_generator_test.rb vendor/plugins/has_many_polymorphs/test/integration/app/README vendor/plugins/has_many_polymorphs/test/integration/app/Rakefile vendor/plugins/has_many_polymorphs/test/integration/app/app/controllers/application.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/controllers/bones_controller.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/addresses_helper.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/application_helper.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/bones_helper.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/sellers_helper.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/states_helper.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/users_helper.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/models/bone.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/models/double_sti_parent.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/models/double_sti_parent_relationship.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/models/organic_substance.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/models/single_sti_parent.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/models/single_sti_parent_relationship.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/models/stick.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/models/stone.rb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/addresses/edit.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/addresses/index.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/addresses/new.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/addresses/show.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/bones/index.rhtml vendor/plugins/has_many_polymorphs/test/integration/app/app/views/layouts/addresses.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/layouts/sellers.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/layouts/states.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/layouts/users.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/sellers/edit.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/sellers/index.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/sellers/new.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/sellers/show.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/states/edit.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/states/index.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/states/new.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/states/show.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/users/edit.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/users/index.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/users/new.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/app/views/users/show.html.erb vendor/plugins/has_many_polymorphs/test/integration/app/config/boot.rb vendor/plugins/has_many_polymorphs/test/integration/app/config/database.yml vendor/plugins/has_many_polymorphs/test/integration/app/config/environment.rb vendor/plugins/has_many_polymorphs/test/integration/app/config/environment.rb.canonical vendor/plugins/has_many_polymorphs/test/integration/app/config/environments/development.rb vendor/plugins/has_many_polymorphs/test/integration/app/config/environments/production.rb vendor/plugins/has_many_polymorphs/test/integration/app/config/environments/test.rb vendor/plugins/has_many_polymorphs/test/integration/app/config/locomotive.yml vendor/plugins/has_many_polymorphs/test/integration/app/config/routes.rb vendor/plugins/has_many_polymorphs/test/integration/app/config/ultrasphinx/default.base vendor/plugins/has_many_polymorphs/test/integration/app/config/ultrasphinx/development.conf.canonical vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/001_create_sticks.rb vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/002_create_stones.rb vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/003_create_organic_substances.rb vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/004_create_bones.rb vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/005_create_single_sti_parents.rb vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/006_create_double_sti_parents.rb vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/007_create_single_sti_parent_relationships.rb vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/008_create_double_sti_parent_relationships.rb vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/009_create_library_model.rb vendor/plugins/has_many_polymorphs/test/integration/app/doc/README_FOR_APP vendor/plugins/has_many_polymorphs/test/integration/app/generators/commenting_generator_test.rb vendor/plugins/has_many_polymorphs/test/integration/app/lib/library_model.rb vendor/plugins/has_many_polymorphs/test/integration/app/public/.htaccess vendor/plugins/has_many_polymorphs/test/integration/app/public/404.html vendor/plugins/has_many_polymorphs/test/integration/app/public/500.html vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.cgi vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.fcgi vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.rb vendor/plugins/has_many_polymorphs/test/integration/app/public/favicon.ico vendor/plugins/has_many_polymorphs/test/integration/app/public/images/rails.png vendor/plugins/has_many_polymorphs/test/integration/app/public/index.html vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/application.js vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/controls.js vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/dragdrop.js vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/effects.js vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/prototype.js vendor/plugins/has_many_polymorphs/test/integration/app/public/robots.txt vendor/plugins/has_many_polymorphs/test/integration/app/public/stylesheets/scaffold.css vendor/plugins/has_many_polymorphs/test/integration/app/script/about vendor/plugins/has_many_polymorphs/test/integration/app/script/breakpointer vendor/plugins/has_many_polymorphs/test/integration/app/script/console vendor/plugins/has_many_polymorphs/test/integration/app/script/destroy vendor/plugins/has_many_polymorphs/test/integration/app/script/generate vendor/plugins/has_many_polymorphs/test/integration/app/script/performance/benchmarker vendor/plugins/has_many_polymorphs/test/integration/app/script/performance/profiler vendor/plugins/has_many_polymorphs/test/integration/app/script/plugin vendor/plugins/has_many_polymorphs/test/integration/app/script/process/inspector vendor/plugins/has_many_polymorphs/test/integration/app/script/process/reaper vendor/plugins/has_many_polymorphs/test/integration/app/script/process/spawner vendor/plugins/has_many_polymorphs/test/integration/app/script/runner vendor/plugins/has_many_polymorphs/test/integration/app/script/server vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/double_sti_parent_relationships.yml vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/double_sti_parents.yml vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/organic_substances.yml vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/single_sti_parent_relationships.yml vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/single_sti_parents.yml vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/sticks.yml vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/stones.yml vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/addresses_controller_test.rb vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/bones_controller_test.rb vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/sellers_controller_test.rb vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/states_controller_test.rb vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/users_controller_test.rb vendor/plugins/has_many_polymorphs/test/integration/app/test/test_helper.rb vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/bone_test.rb vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/double_sti_parent_relationship_test.rb vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/double_sti_parent_test.rb vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/organic_substance_test.rb vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_relationship_test.rb vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_test.rb vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stick_test.rb vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stone_test.rb vendor/plugins/has_many_polymorphs/test/integration/server_test.rb vendor/plugins/has_many_polymorphs/test/models/aquatic/fish.rb vendor/plugins/has_many_polymorphs/test/models/aquatic/pupils_whale.rb vendor/plugins/has_many_polymorphs/test/models/aquatic/whale.rb vendor/plugins/has_many_polymorphs/test/models/beautiful_fight_relationship.rb vendor/plugins/has_many_polymorphs/test/models/canine.rb vendor/plugins/has_many_polymorphs/test/models/cat.rb vendor/plugins/has_many_polymorphs/test/models/dog.rb vendor/plugins/has_many_polymorphs/test/models/eaters_foodstuff.rb vendor/plugins/has_many_polymorphs/test/models/frog.rb vendor/plugins/has_many_polymorphs/test/models/kitten.rb vendor/plugins/has_many_polymorphs/test/models/parentship.rb vendor/plugins/has_many_polymorphs/test/models/person.rb vendor/plugins/has_many_polymorphs/test/models/petfood.rb vendor/plugins/has_many_polymorphs/test/models/tabby.rb vendor/plugins/has_many_polymorphs/test/models/wild_boar.rb vendor/plugins/has_many_polymorphs/test/modules/extension_module.rb vendor/plugins/has_many_polymorphs/test/modules/other_extension_module.rb vendor/plugins/has_many_polymorphs/test/patches/symlinked_plugins_1.2.6.diff vendor/plugins/has_many_polymorphs/test/schema.rb vendor/plugins/has_many_polymorphs/test/setup.rb vendor/plugins/has_many_polymorphs/test/test_helper.rb vendor/plugins/has_many_polymorphs/test/unit/has_many_polymorphs_test.rb vendor/plugins/rspec-rails/History.txt vendor/plugins/rspec-rails/License.txt vendor/plugins/rspec-rails/Manifest.txt vendor/plugins/rspec-rails/README.txt vendor/plugins/rspec-rails/TODO.txt vendor/plugins/rspec-rails/features/step_definitions/people.rb vendor/plugins/rspec-rails/features/support/env.rb vendor/plugins/rspec-rails/features/transactions/transactions_should_rollback.feature vendor/plugins/rspec-rails/generators/rspec/templates/rspec.rake vendor/plugins/rspec-rails/generators/rspec/templates/script/autospec vendor/plugins/rspec-rails/generators/rspec_default_values.rb vendor/plugins/rspec-rails/lib/spec/rails/example/cookies_proxy.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/spec/runner/configuration.rb vendor/plugins/rspec-rails/lib/spec/rails/interop/testcase.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers/ar_be_valid.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers/change.rb vendor/plugins/rspec-rails/rspec-rails.gemspec vendor/plugins/rspec-rails/spec/autotest/mappings_spec.rb vendor/plugins/rspec-rails/spec/resources/controllers/action_view_base_spec_controller.rb vendor/plugins/rspec-rails/spec/resources/controllers/application.rb vendor/plugins/rspec-rails/spec/resources/controllers/controller_spec_controller.rb vendor/plugins/rspec-rails/spec/resources/controllers/redirect_spec_controller.rb vendor/plugins/rspec-rails/spec/resources/controllers/render_spec_controller.rb vendor/plugins/rspec-rails/spec/resources/controllers/rjs_spec_controller.rb vendor/plugins/rspec-rails/spec/resources/helpers/addition_helper.rb vendor/plugins/rspec-rails/spec/resources/helpers/explicit_helper.rb vendor/plugins/rspec-rails/spec/resources/helpers/more_explicit_helper.rb vendor/plugins/rspec-rails/spec/resources/helpers/plugin_application_helper.rb vendor/plugins/rspec-rails/spec/resources/helpers/view_spec_helper.rb vendor/plugins/rspec-rails/spec/resources/models/animal.rb vendor/plugins/rspec-rails/spec/resources/models/person.rb vendor/plugins/rspec-rails/spec/resources/models/thing.rb vendor/plugins/rspec-rails/spec/resources/views/controller_spec/_partial.rhtml vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_setting_the_assigns_hash.rhtml vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_with_errors_in_template.rhtml vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_with_template.rhtml vendor/plugins/rspec-rails/spec/resources/views/layouts/application.rhtml vendor/plugins/rspec-rails/spec/resources/views/layouts/simple.rhtml vendor/plugins/rspec-rails/spec/resources/views/objects/_object.html.erb vendor/plugins/rspec-rails/spec/resources/views/render_spec/_a_partial.rhtml vendor/plugins/rspec-rails/spec/resources/views/render_spec/action_with_alternate_layout.rhtml vendor/plugins/rspec-rails/spec/resources/views/render_spec/some_action.html.erb vendor/plugins/rspec-rails/spec/resources/views/render_spec/some_action.js.rjs vendor/plugins/rspec-rails/spec/resources/views/render_spec/some_action.rjs vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/_replacement_partial.rhtml vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/hide_div.rjs vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/hide_page_element.rjs vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/insert_html.rjs vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace.rjs vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace_html.rjs vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace_html_with_partial.rjs vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/visual_effect.rjs vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/visual_toggle_effect.rjs vendor/plugins/rspec-rails/spec/resources/views/tag_spec/no_tags.rhtml vendor/plugins/rspec-rails/spec/resources/views/tag_spec/single_div_with_no_attributes.rhtml vendor/plugins/rspec-rails/spec/resources/views/tag_spec/single_div_with_one_attribute.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial_used_twice.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial_with_local_variable.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial_with_sub_partial.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/_spacer.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/accessor.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/block_helper.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/entry_form.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/explicit_helper.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/foo/show.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/implicit_helper.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/multiple_helpers.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/path_params.html.erb vendor/plugins/rspec-rails/spec/resources/views/view_spec/should_not_receive.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial_using_collection.rhtml vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial_with_array.rhtml vendor/plugins/rspec-rails/spec/spec/rails/example/assigns_hash_proxy_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/example/configuration_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/example/controller_isolation_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/example/controller_spec_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/example/cookies_proxy_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/example/example_group_factory_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/example/helper_spec_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/example/model_spec_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/example/shared_behaviour_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/example/view_spec_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/extensions/action_controller_rescue_action_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/extensions/action_view_base_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/extensions/active_record_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/interop/testcase_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/matchers/ar_be_valid_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/matchers/assert_select_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/matchers/errors_on_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/matchers/have_text_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/matchers/include_text_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/matchers/redirect_to_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/matchers/render_template_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/matchers/should_change_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/mocks/ar_classes.rb vendor/plugins/rspec-rails/spec/spec/rails/mocks/mock_model_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/mocks/stub_model_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/sample_modified_fixture.rb vendor/plugins/rspec-rails/spec/spec/rails/sample_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/spec_server_spec.rb vendor/plugins/rspec-rails/spec/spec/rails/spec_spec.rb vendor/plugins/rspec/History.txt vendor/plugins/rspec/License.txt vendor/plugins/rspec/Manifest.txt vendor/plugins/rspec/README.txt vendor/plugins/rspec/TODO.txt vendor/plugins/rspec/examples/failing/README.txt vendor/plugins/rspec/examples/failing/diffing_spec.rb vendor/plugins/rspec/examples/failing/failing_autogenerated_docstrings_example.rb vendor/plugins/rspec/examples/failing/failure_in_after.rb vendor/plugins/rspec/examples/failing/failure_in_before.rb vendor/plugins/rspec/examples/failing/mocking_example.rb vendor/plugins/rspec/examples/failing/mocking_with_flexmock.rb vendor/plugins/rspec/examples/failing/mocking_with_mocha.rb vendor/plugins/rspec/examples/failing/mocking_with_rr.rb vendor/plugins/rspec/examples/failing/partial_mock_example.rb vendor/plugins/rspec/examples/failing/predicate_example.rb vendor/plugins/rspec/examples/failing/raising_example.rb vendor/plugins/rspec/examples/failing/spec_helper.rb vendor/plugins/rspec/examples/failing/syntax_error_example.rb vendor/plugins/rspec/examples/failing/team_spec.rb vendor/plugins/rspec/examples/failing/timeout_behaviour.rb vendor/plugins/rspec/examples/passing/autogenerated_docstrings_example.rb vendor/plugins/rspec/examples/passing/before_and_after_example.rb vendor/plugins/rspec/examples/passing/behave_as_example.rb vendor/plugins/rspec/examples/passing/custom_expectation_matchers.rb vendor/plugins/rspec/examples/passing/custom_formatter.rb vendor/plugins/rspec/examples/passing/dynamic_spec.rb vendor/plugins/rspec/examples/passing/file_accessor.rb vendor/plugins/rspec/examples/passing/file_accessor_spec.rb vendor/plugins/rspec/examples/passing/greeter_spec.rb vendor/plugins/rspec/examples/passing/helper_method_example.rb vendor/plugins/rspec/examples/passing/io_processor.rb vendor/plugins/rspec/examples/passing/io_processor_spec.rb vendor/plugins/rspec/examples/passing/legacy_spec.rb vendor/plugins/rspec/examples/passing/mocking_example.rb vendor/plugins/rspec/examples/passing/multi_threaded_behaviour_runner.rb vendor/plugins/rspec/examples/passing/nested_classes_example.rb vendor/plugins/rspec/examples/passing/partial_mock_example.rb vendor/plugins/rspec/examples/passing/pending_example.rb vendor/plugins/rspec/examples/passing/predicate_example.rb vendor/plugins/rspec/examples/passing/priority.txt vendor/plugins/rspec/examples/passing/shared_example_group_example.rb vendor/plugins/rspec/examples/passing/shared_stack_examples.rb vendor/plugins/rspec/examples/passing/simple_matcher_example.rb vendor/plugins/rspec/examples/passing/spec_helper.rb vendor/plugins/rspec/examples/passing/stack.rb vendor/plugins/rspec/examples/passing/stack_spec.rb vendor/plugins/rspec/examples/passing/stack_spec_with_nested_example_groups.rb vendor/plugins/rspec/examples/passing/stubbing_example.rb vendor/plugins/rspec/examples/passing/yielding_example.rb vendor/plugins/rspec/features/before_and_after_blocks/before_and_after_blocks.feature vendor/plugins/rspec/features/example_groups/autogenerated_docstrings.feature vendor/plugins/rspec/features/example_groups/example_group_with_should_methods.feature vendor/plugins/rspec/features/example_groups/nested_groups.feature vendor/plugins/rspec/features/example_groups/output.feature vendor/plugins/rspec/features/interop/examples_and_tests_together.feature vendor/plugins/rspec/features/interop/test_but_not_test_unit.feature vendor/plugins/rspec/features/interop/test_case_with_should_methods.feature vendor/plugins/rspec/features/mock_framework_integration/use_flexmock.feature vendor/plugins/rspec/features/step_definitions/running_rspec.rb vendor/plugins/rspec/features/support/env.rb vendor/plugins/rspec/features/support/helpers/cmdline.rb vendor/plugins/rspec/features/support/helpers/story_helper.rb vendor/plugins/rspec/features/support/matchers/smart_match.rb vendor/plugins/rspec/lib/adapters/mock_frameworks/flexmock.rb vendor/plugins/rspec/lib/adapters/mock_frameworks/mocha.rb vendor/plugins/rspec/lib/adapters/mock_frameworks/rr.rb vendor/plugins/rspec/lib/adapters/mock_frameworks/rspec.rb vendor/plugins/rspec/lib/spec/dsl.rb vendor/plugins/rspec/lib/spec/dsl/main.rb vendor/plugins/rspec/lib/spec/example/before_and_after_hooks.rb vendor/plugins/rspec/lib/spec/matchers/errors.rb vendor/plugins/rspec/lib/spec/matchers/generated_descriptions.rb vendor/plugins/rspec/lib/spec/matchers/match_array.rb vendor/plugins/rspec/lib/spec/matchers/method_missing.rb vendor/plugins/rspec/lib/spec/matchers/wrap_expectation.rb vendor/plugins/rspec/lib/spec/mocks/argument_constraints.rb vendor/plugins/rspec/lib/spec/ruby.rb vendor/plugins/rspec/lib/spec/runner/configuration.rb vendor/plugins/rspec/lib/spec/runner/formatter/story/progress_bar_formatter.rb vendor/plugins/rspec/resources/rake/examples.rake vendor/plugins/rspec/resources/rake/examples_with_rcov.rake vendor/plugins/rspec/resources/rake/failing_examples_with_html.rake vendor/plugins/rspec/resources/rake/verify_rcov.rake vendor/plugins/rspec/resources/spec/example_group_with_should_methods.rb vendor/plugins/rspec/resources/spec/simple_spec.rb vendor/plugins/rspec/resources/spec/spec_with_flexmock.rb vendor/plugins/rspec/resources/test/spec_and_test_together.rb vendor/plugins/rspec/resources/test/spec_including_test_but_not_unit.rb vendor/plugins/rspec/resources/test/test_case_with_should_methods.rb vendor/plugins/rspec/rspec.gemspec vendor/plugins/rspec/spec/autotest/autotest_helper.rb vendor/plugins/rspec/spec/autotest/autotest_matchers.rb vendor/plugins/rspec/spec/autotest/failed_results_re_spec.rb vendor/plugins/rspec/spec/spec/dsl/main_spec.rb vendor/plugins/rspec/spec/spec/example/helper_method_spec.rb vendor/plugins/rspec/spec/spec/expectations/wrap_expectation_spec.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_with_options_hash.rb vendor/plugins/rspec/spec/spec/matchers/match_array_spec.rb vendor/plugins/rspec/spec/spec/mocks/bug_report_496.rb vendor/plugins/rspec/spec/spec/mocks/bug_report_600_spec.rb vendor/plugins/rspec/spec/spec/mocks/hash_not_including_matcher_spec.rb vendor/plugins/rspec/spec/spec/mocks/nil_expectation_warning_spec.rb vendor/plugins/rspec/spec/spec/mocks/stubbed_message_expectations_spec.rb vendor/plugins/rspec/spec/spec/runner/configuration_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/base_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/base_text_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.7.html vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.9.1.html vendor/plugins/rspec/spec/spec/runner/formatter/story/progress_bar_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.7.html vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.9.1.html vendor/plugins/rspec/spec/spec/runner/resources/custom_example_group_runner.rb vendor/plugins/rspec/spec/spec/spec_spec.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib")) +require 'rubygems' require 'spec' exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT)) script/spec @@ -1,5 +1,4 @@ #!/usr/bin/env ruby -$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../rspec/lib' # For svn $LOAD_PATH.unshift File.dirname(__FILE__) + '/../vendor/plugins/rspec/lib' # For rspec installed as plugin require 'rubygems' require 'drb/drb' @@ -14,29 +13,47 @@ module Spec def run(argv, stderr, stdout) $stdout = stdout $stderr = stderr - - base = ActiveRecord::Base - def base.clear_reloadable_connections! - active_connections.each do |name, conn| - if conn.requires_reloading? - conn.disconnect! - active_connections.delete(name) + + unless ActiveRecord::Base.respond_to?(:clear_reloadable_connections!) + base = ActiveRecord::Base + def base.clear_reloadable_connections! + active_connections.each do |name, conn| + if conn.requires_reloading? + conn.disconnect! + active_connections.delete(name) + end end end - end + end + + ActiveRecord::Base.clear_reloadable_connections! if ActionController.const_defined?(:Dispatcher) dispatcher = ::ActionController::Dispatcher.new($stdout) - dispatcher.cleanup_application(true) + dispatcher.cleanup_application elsif ::Dispatcher.respond_to?(:reset_application!) ::Dispatcher.reset_application! else raise "Application reloading failed" end - ::Dependencies.mechanism = :load + if Object.const_defined?(:Fixtures) && Fixtures.respond_to?(:reset_cache) + Fixtures.reset_cache + end + + if ::ActiveSupport.const_defined?(:Dependencies) + ::ActiveSupport::Dependencies.mechanism = :load + else + ::Dependencies.mechanism = :load + end + require_dependency('application.rb') unless Object.const_defined?(:ApplicationController) load File.dirname(__FILE__) + '/../spec/spec_helper.rb' + if in_memory_database? + load "#{RAILS_ROOT}/db/schema.rb" # use db agnostic schema by default + ActiveRecord::Migrator.up('db/migrate') # use migrations + end + ::Spec::Runner::CommandLine.run( ::Spec::Runner::OptionParser.parse( argv, @@ -45,6 +62,12 @@ module Spec ) ) end + + def in_memory_database? + ENV["RAILS_ENV"] == "test" and + ::ActiveRecord::Base.connection.class.to_s == "ActiveRecord::ConnectionAdapters::SQLite3Adapter" and + ::Rails::Configuration.new.database_configuration['test']['database'] == ':memory:' + end end end end @@ -91,7 +114,7 @@ opts.parse!(ARGV) puts "Ready" exec_server = lambda { trap("USR2") { restart_test_server } if Signal.list.has_key?("USR2") - DRb.start_service("druby://localhost:8989", Spec::Runner::RailsSpecServer.new) + DRb.start_service("druby://127.0.0.1:8989", Spec::Runner::RailsSpecServer.new) DRb.thread.join } script/spec_server @@ -24,7 +24,7 @@ describe OptionType do ['name', 'presentation'].each do |field| it "should require #{field}" do @option_type.should_not be_valid - @option_type.errors.full_messages.should include("#{field.intern.l(field).humanize} #{:error_message_blank.l}") + @option_type.errors.full_messages.should include("#{field.humanize} #{I18n.translate("activerecord.errors.messages.blank")}") end end spec/models/option_type_spec.rb @@ -95,7 +95,6 @@ describe "PreferenceDefinition with :boolean type" do end it "should type_cast to false if value is not true string" do - @definition.type_cast('').should be_false @definition.type_cast('false').should be_false @definition.type_cast('hola').should be_false end spec/models/preference_definition_spec.rb @@ -23,7 +23,7 @@ describe ProductProperty do ['value'].each do |field| it "should require #{field}" do @product_property.should_not be_valid - @product_property.errors.full_messages.should include("#{field.intern.l(field).humanize} #{:error_message_blank.l}") + @product_property.errors.full_messages.should include("#{field.humanize} #{I18n.translate("activerecord.errors.messages.blank")}") end end spec/models/product_property_spec.rb @@ -32,7 +32,7 @@ describe Product do ['name', 'master_price', 'description'].each do |field| it "should require #{field}" do @product.should_not be_valid - @product.errors.full_messages.should include("#{field.intern.l(field).humanize} #{:error_message_blank.l}") + @product.errors.full_messages.should include("#{field.humanize} #{I18n.translate("activerecord.errors.messages.blank")}") end end spec/models/product_spec.rb @@ -24,7 +24,7 @@ describe Property do ['name', 'presentation'].each do |field| it "should require #{field}" do @property.should_not be_valid - @property.errors.full_messages.should include("#{field.intern.l(field).humanize} #{:error_message_blank.l}") + @property.errors.full_messages.should include("#{field.humanize} #{I18n.translate("activerecord.errors.messages.blank")}") end end spec/models/property_spec.rb @@ -23,7 +23,7 @@ describe Prototype do ['name'].each do |field| it "should require #{field}" do @prototype.should_not be_valid - @prototype.errors.full_messages.should include("#{field.intern.l(field).humanize} #{:error_message_blank.l}") + @prototype.errors.full_messages.should include("#{field.humanize} #{I18n.translate("activerecord.errors.messages.blank")}") end end spec/models/prototype_spec.rb @@ -13,7 +13,7 @@ describe State do ['country', 'name'].each do |field| it "should require #{field}" do @state.should_not be_valid - @state.errors.full_messages.should include("#{field.intern.l(field).humanize} #{:error_message_blank.l}") + @state.errors.full_messages.should include("#{field.humanize} #{I18n.translate("activerecord.errors.messages.blank")}") end end spec/models/state_spec.rb @@ -28,7 +28,7 @@ describe Variant do ['product'].each do |field| it "should require #{field}" do @variant.should_not be_valid - @variant.errors.full_messages.should include("#{field.intern.l(field).humanize} #{:error_message_blank.l}") + @variant.errors.full_messages.should include("#{field.humanize} #{I18n.translate("activerecord.errors.messages.blank")}") end end spec/models/variant_spec.rb @@ -1,6 +1,4 @@ --colour ---format -specdoc ---loadby -mtime +--format progress +--loadby mtime --reverse spec/spec.opts @@ -13,7 +13,7 @@ describe '/admin/products/edit' do ) assigns[:product] = @product - template.stub!(:object_url).and_return(admin_product_url(@product)) + template.stub!(:object_url).and_return('') template.stub!(:collection_url).and_return('') assigns[:product_admin_tabs] = [] @@ -37,7 +37,7 @@ describe '/admin/products/edit' do it "should display the standard edit form" do render '/admin/products/edit' - response.should have_tag('form[method=?][action=?]', 'post', admin_product_url(@product)) do + response.should have_tag('form[method=?][action=?]', 'post', '') do with_tag("input[type=?][id=?][value=?]", 'text', 'product_name', @product.name) with_tag("textarea[id=?]", 'product_description', :text => @product.description) with_tag("input[type=?][id=?][value=?]", 'text', 'product_master_price', @product.master_price) @@ -74,7 +74,7 @@ describe '/admin/products/edit' do render '/admin/products/edit' - response.should have_tag('form[method=?][action=?]', 'post', admin_product_url(@product)) do + response.should have_tag('form[method=?][action=?]', 'post', '') do with_tag("input[type=?][id=?][value=?]", 'text', 'product_weight', '1200') with_tag("input[type=?][id=?][value=?]", 'text', 'product_height', '99.00') #format present spec/views/admin/products/edit.html.erb_spec.rb @@ -50,14 +50,14 @@ describe ProductsHelper do describe "format_price" do before :each do @price = 100 - Locale.code = "en-US" + I18n.locale = "en-US" end describe "localization in general" do it "should format the price using $ when locale is en-US" do helper.format_price(@price).should include("$100.00") end - it "should format the price using $ when locale is es-ES" do - Locale.code = "es-ES" + it "should format the price using $ when locale is es" do + I18n.locale = "es" helper.format_price(@price).should include("100,00 €") end end vendor/extensions/tax_calculator/spec/helpers/products_helper_spec.rb @@ -1,15 +1 @@ -%w[calendar_date_select includes_helper].each { |file| - require File.join( File.dirname(__FILE__), "lib",file) -} - -ActionView::Helpers::FormHelper.send(:include, CalendarDateSelect::FormHelper) -ActionView::Base.send(:include, CalendarDateSelect::FormHelper) -ActionView::Base.send(:include, CalendarDateSelect::IncludesHelper) - -# install files -['/public/javascripts/calendar_date_select', '/public/stylesheets/calendar_date_select', '/public/images/calendar_date_select'].each{|dir| - source = File.join(directory,dir) - dest = RAILS_ROOT + dir - FileUtils.mkdir_p(dest) - FileUtils.cp_r(Dir.glob(source+'/*.*'), dest) -} unless File.exists?(RAILS_ROOT + '/public/javascripts/calendar_date_select/calendar_date_select.js') +require File.dirname(__FILE__) + "/lib/calendar_date_select.rb" vendor/plugins/calendar_date_select/init.rb @@ -32,8 +32,9 @@ $("cds_test").readOnly = false; }}, teardown: function() { with(this){ - if (typeof(cds)!="undefined") - assert(cds.closed,"all tests should close their calendar control"); + if (typeof(cds)!="undefined") assert(cds.closed,"all tests should close their calendar control"); + Date.first_day_of_week = 0; + Date.weekdays = $w("S M T W T F S") }}, testMixedTime_feedDateWithAndWithoutTime_shouldSetAccordingly: function() { with(this) { $A(["January 2, 2007 5:00 pm", "January 2, 2007 0:00 pm"]).each(function(d) { @@ -157,7 +158,7 @@ test_timePassed_notUsingTime_shouldIgnore: function() {with(this) { $("cds_test").value = "May 10, 2007 5:00 pm"; cds = new CalendarDateSelect($("cds_test"), {time:false}); - assert(cds.options.get("close_on_click"), "should set close_on_click to true when not using time") + assert(cds.closeOnClick(), "should set close_on_click to true when not using time") assertEqual(false, cds.use_time, "When parsing time"); cds.today(); assert(cds.closed, "should close when clicking today"); @@ -316,6 +317,15 @@ }); cds.close(); + }}, + test__should_pull_up_dec_07_when_first_day_of_week_is_1: function() {with (this) { + Date.first_day_of_week = 1; + Date.weekdays = $w("M T W T F S S"); + $('cds_test').value = "December 1, 2007"; + cds = new CalendarDateSelect($("cds_test")); + + assertEqual(1, $$(".calendar_date_select").length); + cds.close(); }} }); // ]]> vendor/plugins/calendar_date_select/js_test/functional/cds_test.html @@ -1,192 +1,33 @@ -class CalendarDateSelect - FORMATS = { - :natural => { - :date => "%B %d, %Y", - :time => " %I:%M %p" - }, - :hyphen_ampm => { - :date => "%Y-%m-%d", - :time => " %I:%M %p", - :javascript_include => "format_hyphen_ampm" - }, - :finnish => { - :date => "%d.%m.%Y", - :time => " %H:%M", - :javascript_include => "format_finnish" - }, - :american => { - :date => "%m/%d/%Y", - :time => " %I:%M %p", - :javascript_include => "format_american" - }, - :euro_24hr => { - :date => "%d %B %Y", - :time => " %H:%M", - :javascript_include => "format_euro_24hr" - }, - :italian => { - :date => "%d/%m/%Y", - :time => " %H:%M", - :javascript_include => "format_italian" - } - } - - cattr_accessor :image - @@image = "calendar_date_select/calendar.gif" - - cattr_reader :format - @@format = FORMATS[:natural] - - class << self - def format=(format) - raise "CalendarDateSelect: Unrecognized format specification: #{format}" unless FORMATS.has_key?(format) - @@format = FORMATS[format] - end - - def javascript_format_include - @@format[:javascript_include] && "calendar_date_select/#{@@format[:javascript_include]}" - end - - def date_format_string(time=false) - @@format[:date] + ( time ? @@format[:time] : "" ) - end - - def format_date(date) - if Date===date - date.strftime(date_format_string(false)) - else - date.strftime(date_format_string(true)) - end - end - - def has_time?(value) - /[0-9]:[0-9]{2}/.match(value.to_s) - end - end - - module FormHelper - def calendar_date_select_tag( name, value = nil, options = {}) - calendar_options = calendar_date_select_process_options(options) - value = (value.strftime(calendar_options[:format]) rescue value) if (value.respond_to?("strftime")) - - calendar_options.delete(:format) - - options[:id] ||= name - tag = calendar_options[:hidden] || calendar_options[:embedded] ? - hidden_field_tag(name, value, options) : - text_field_tag(name, value, options) - - calendar_date_select_output(tag, calendar_options) - end - - # extracts any options passed into calendar date select, appropriating them to either the Javascript call or the html tag. - def calendar_date_select_process_options(options) - calendar_options = {} - callbacks = [:before_show, :before_close, :after_show, :after_close, :after_navigate] - for key in [:time, :valid_date_check, :embedded, :buttons, :format, :year_range, :month_year, :popup, :hidden] + callbacks - calendar_options[key] = options.delete(key) if options.has_key?(key) - end - - # if passing in mixed, pad it with single quotes - calendar_options[:time] = "'mixed'" if calendar_options[:time].to_s=="mixed" - calendar_options[:month_year] = "'#{calendar_options[:month_year]}'" if calendar_options[:month_year] - - # if we are forcing the popup, automatically set the readonly property on the input control. - if calendar_options[:popup].to_s == "force" - calendar_options[:popup] = "'force'" - options[:readonly] = true - end - - if (vdc=calendar_options.delete(:valid_date_check)) - if vdc.include?(";") || vdc.include?("function") - throw ":valid_date_check function is missing a 'return' statement. Try something like: :valid_date_check => 'if (date > new(Date)) return true; else return false;'" unless vdc.include?("return"); - end - - vdc = "return(#{vdc})" unless vdc.include?("return") - vdc = "function(date) { #{vdc} }" unless vdc.include?("function") - calendar_options[:valid_date_check] = vdc - end - - calendar_options[:popup_by] ||= "this" if calendar_options[:hidden] - - # surround any callbacks with a function, if not already done so - for key in callbacks - calendar_options[key] = "function(param) { #{calendar_options[key]} }" unless calendar_options[key].include?("function") if calendar_options[key] - end - - calendar_options[:year_range] = format_year_range(calendar_options[:year_range] || 10) - calendar_options - end - - def calendar_date_select(object, method, options={}) - obj = options.include?(:object) ? options[:object] : instance_eval("@#{object}") - - if !options.include?(:time) && obj.class.respond_to?("columns_hash") - column_type = (obj.class.columns_hash[method.to_s].type rescue nil) - options[:time] = true if column_type == :datetime - end - - use_time = options[:time] - - if options[:time].to_s=="mixed" - use_time = false if Date===obj.send(method) - end - - calendar_options = calendar_date_select_process_options(options) - - options[:value] ||= - if(obj.respond_to?(method) && obj.send(method).respond_to?(:strftime)) - obj.send(method).strftime(CalendarDateSelect.date_format_string(use_time)) - elsif obj.respond_to?("#{method}_before_type_cast") - obj.send("#{method}_before_type_cast") - elsif obj.respond_to?(method) - obj.send(method).to_s - else - nil - end - - tag = ActionView::Helpers::InstanceTag.new(object, method, self, nil, options.delete(:object)) - calendar_date_select_output( - tag.to_input_field_tag( (calendar_options[:hidden] || calendar_options[:embedded]) ? "hidden" : "text", options), - calendar_options - ) - end - - def calendar_date_select_output(input, calendar_options = {}) - out = input - if calendar_options[:embedded] - uniq_id = "cds_placeholder_#{(rand*100000).to_i}" - # we need to be able to locate the target input element, so lets stick an invisible span tag here we can easily locate - out << content_tag(:span, nil, :style => "display: none; position: absolute;", :id => uniq_id) - - out << javascript_tag("new CalendarDateSelect( $('#{uniq_id}').previous(), #{options_for_javascript(calendar_options)} ); ") - else - out << " " - - out << image_tag(CalendarDateSelect.image, - :onclick => "new CalendarDateSelect( $(this).previous(), #{options_for_javascript(calendar_options)} );", - :style => 'border:0px; cursor:pointer;') - end - - out - end - - private - def format_year_range(year) # nodoc - return year unless year.respond_to?(:first) - return "[#{year.first}, #{year.last}]" unless year.first.respond_to?(:strftime) - return "[#{year.first.year}, #{year.last.year}]" - end - end -end - - -module ActionView - module Helpers - class FormBuilder - def calendar_date_select(method, options = {}) - @template.calendar_date_select(@object_name, method, options.merge(:object => @object)) - end - end - end -end +require "calendar_date_select/calendar_date_select.rb" +require "calendar_date_select/form_helpers.rb" +require "calendar_date_select/includes_helper.rb" + +if Object.const_defined?(:Rails) && File.directory?(Rails.root + "/public") + ActionView::Helpers::FormHelper.send(:include, CalendarDateSelect::FormHelpers) + ActionView::Base.send(:include, CalendarDateSelect::FormHelpers) + ActionView::Base.send(:include, CalendarDateSelect::IncludesHelper) + + # Filthy backwards compatibility hooks... grumble + if ([Rails::VERSION::MAJOR, Rails::VERSION::MINOR] <=> [2, 2]) == -1 + ActionView::Helpers::InstanceTag.class_eval do + def self.new_with_backwards_compatibility(object_name, method_name, template_object, object = nil) + new(object_name, method_name, template_object, nil, object) + end + end + + else + ActionView::Helpers::InstanceTag.class_eval do + class << self; alias new_with_backwards_compatibility new; end + end + end + + # install files + unless File.exists?(RAILS_ROOT + '/public/javascripts/calendar_date_select/calendar_date_select.js') + ['/public', '/public/javascripts/calendar_date_select', '/public/stylesheets/calendar_date_select', '/public/images/calendar_date_select', '/public/javascripts/calendar_date_select/locale'].each do |dir| + source = File.dirname(__FILE__) + "/../#{dir}" + dest = RAILS_ROOT + dir + FileUtils.mkdir_p(dest) + FileUtils.cp(Dir.glob(source+'/*.*'), dest) + end + end +end \ No newline at end of file vendor/plugins/calendar_date_select/lib/calendar_date_select.rb @@ -1,23 +1,22 @@ -// CalendarDateSelect version 1.10.0 - a prototype based date picker -// Questions, comments, bugs? - email the Author - Tim Harper <"timseeharper@gmail.seeom".gsub("see", "c")> +// CalendarDateSelect version 1.13 - a prototype based date picker +// Questions, comments, bugs? - see the project page: http://code.google.com/p/calendardateselect if (typeof Prototype == 'undefined') alert("CalendarDateSelect Error: Prototype could not be found. Please make sure that your application's layout includes prototype.js (.g. <%= javascript_include_tag :defaults %>) *before* it includes calendar_date_select.js (.g. <%= calendar_date_select_includes %>)."); if (Prototype.Version < "1.6") alert("Prototype 1.6.0 is required. If using earlier version of prototype, please use calendar_date_select version 1.8.3"); Element.addMethods({ purgeChildren: function(element) { $A(element.childNodes).each(function(e){$(e).remove();}); }, build: function(element, type, options, style) { - var newElement = Element.build(type, options, style); + var newElement = Element.buildAndAppend(type, options, style); element.appendChild(newElement); return newElement; } }); -Element.build = function(type, options, style) +Element.buildAndAppend = function(type, options, style) { var e = $(document.createElement(type)); - $H(options).each(function(pair) { eval("e." + pair.key + " = pair.value" ); }); - if (style) - $H(style).each(function(pair) { eval("e.style." + pair.key + " = pair.value" ); }); + $H(options).each(function(pair) { e[pair.key] = pair.value }); + if (style) e.setStyle(style); return e; }; nil = null; @@ -47,7 +46,8 @@ window.f_scrollTop = function() { return ([window.pageYOffset ? window.pageYOffs _translations = { "OK": "OK", "Now": "Now", - "Today": "Today" + "Today": "Today", + "Clear": "Clear" } SelectBox = Class.create(); SelectBox.prototype = { @@ -72,7 +72,7 @@ CalendarDateSelect.prototype = { initialize: function(target_element, options) { this.target_element = $(target_element); // make sure it's an element, not a string if (!this.target_element) { alert("Target element " + target_element + " not found!"); return false;} - if (down = this.target_element.down("INPUT")) this.target_element = down; + if (this.target_element.tagName != "INPUT") this.target_element = this.target_element.down("INPUT") this.target_element.calendar_date_select = this; this.last_click_at = 0; @@ -82,8 +82,8 @@ CalendarDateSelect.prototype = { popup: nil, time: false, buttons: true, + clear_button: true, year_range: 10, - calendar_div: nil, close_on_click: nil, minute_interval: 5, popup_by: this.target_element, @@ -91,39 +91,16 @@ CalendarDateSelect.prototype = { onchange: this.target_element.onchange, valid_date_check: nil }).merge(options || {}); - - this.selection_made = $F(this.target_element).strip()!==""; this.use_time = this.options.get("time"); - - this.callback("before_show") - this.calendar_div = $(this.options.get("calendar_div")); - this.parseDate(); - - // by default, stick it by the target element (if embedded, that's where we'll want it to show up) - if (this.calendar_div == nil) { this.calendar_div = $( this.options.get("embedded") ? this.target_element.parentNode : document.body ).build('div'); } - if (!this.options.get("embedded")) this.calendar_div.setStyle( { position:"absolute", visibility: "hidden", left:0, top:0 } ) - - this.calendar_div.addClassName("calendar_date_select"); - - if (this.options.get("embedded")) this.options.set("close_on_click", false); - // logic for close on click - if (this.options.get("close_on_click")===nil ) - { - if (this.options.get("time")) - this.options.set("close_on_click", false); - else - this.options.set("close_on_click", true); - } - - // set the click handler to check if a user has clicked away from the document + this.callback("before_show") + this.initCalendarDiv(); if(!this.options.get("embedded")) { + this.positionCalendarDiv() + // set the click handler to check if a user has clicked away from the document Event.observe(document, "mousedown", this.closeIfClickedOut_handler = this.closeIfClickedOut.bindAsEventListener(this)); Event.observe(document, "keypress", this.keyPress_handler = this.keyPress.bindAsEventListener(this)); } - - this.init(); - if(!this.options.get("embedded")) { this.positionCalendarDiv() }; this.callback("after_show") }, positionCalendarDiv: function() { @@ -140,9 +117,18 @@ CalendarDateSelect.prototype = { this.calendar_div.setStyle({visibility:""}); // draw an iframe behind the calendar -- ugly hack to make IE 6 happy - if(navigator.appName=="Microsoft Internet Explorer") this.iframe = $(document.body).build("iframe", {className: "ie6_blocker"}, { left: left_px, top: top_px, height: c_height.toString()+"px", width: c_width.toString()+"px", border: "0px"}) + if(navigator.appName=="Microsoft Internet Explorer") this.iframe = $(document.body).build("iframe", {src: "javascript:false", className: "ie6_blocker"}, { left: left_px, top: top_px, height: c_height.toString()+"px", width: c_width.toString()+"px", border: "0px"}) }, - init: function() { + initCalendarDiv: function() { + if (this.options.get("embedded")) { + var parent = this.target_element.parentNode; + var style = {} + } else { + var parent = document.body + var style = { position:"absolute", visibility: "hidden", left:0, top:0 } + } + this.calendar_div = $(parent).build('div', {className: "calendar_date_select"}, style); + var that = this; // create the divs $w("top header body buttons footer bottom").each(function(name) { @@ -152,7 +138,7 @@ CalendarDateSelect.prototype = { this.initHeaderDiv(); this.initButtonsDiv(); this.initCalendarGrid(); - this.updateFooter("&nbsp;"); + this.updateFooter("&#160;"); this.refresh(); this.setUseTime(this.use_time); @@ -231,14 +217,14 @@ CalendarDateSelect.prototype = { } else if (! this.options.get("buttons")) buttons_div.remove(); if (this.options.get("buttons")) { - buttons_div.build("span", {innerHTML: "&nbsp;"}); + buttons_div.build("span", {innerHTML: "&#160;"}); if (this.options.get("time")=="mixed" || !this.options.get("time")) b = buttons_div.build("a", { innerHTML: _translations["Today"], href: "#", onclick: function() {this.today(false); return false;}.bindAsEventListener(this) }); - if (this.options.get("time")=="mixed") buttons_div.build("span", {innerHTML: " | ", className:"button_seperator"}) + if (this.options.get("time")=="mixed") buttons_div.build("span", {innerHTML: "&#160;|&#160;", className:"button_seperator"}) if (this.options.get("time")) b = buttons_div.build("a", { innerHTML: _translations["Now"], @@ -246,11 +232,15 @@ CalendarDateSelect.prototype = { onclick: function() {this.today(true); return false}.bindAsEventListener(this) }); - if (!this.options.get("embedded")) + if (!this.options.get("embedded") && !this.closeOnClick()) { - buttons_div.build("span", {innerHTML: "&nbsp;"}); + buttons_div.build("span", {innerHTML: "&#160;|&#160;", className:"button_seperator"}) buttons_div.build("a", { innerHTML: _translations["OK"], href: "#", onclick: function() {this.close(); return false;}.bindAsEventListener(this) }); } + if (this.options.get('clear_button')) { + buttons_div.build("span", {innerHTML: "&#160;|&#160;", className:"button_seperator"}) + buttons_div.build("a", { innerHTML: _translations["Clear"], href: "#", onclick: function() {this.clearDate(); if (!this.options.get("embedded")) this.close(); return false;}.bindAsEventListener(this) }); + } } }, refresh: function () @@ -287,7 +277,7 @@ CalendarDateSelect.prototype = { if (this.today_cell) this.today_cell.removeClassName("today"); - if ( $R( 0, 42 ).include(days_until = this.beginning_date.daysDistance(today)) ) { + if ( $R( 0, 41 ).include(days_until = this.beginning_date.stripTime().daysDistance(today)) ) { this.today_cell = this.calendar_day_grid[days_until]; this.today_cell.addClassName("today"); } @@ -327,12 +317,10 @@ CalendarDateSelect.prototype = { this.updateFooter(hover_date.toFormattedString(this.use_time)); }, dayHoverOut: function(element) { this.updateFooter(); }, + clearSelectedClass: function() {if (this.selected_cell) this.selected_cell.removeClassName("selected");}, setSelectedClass: function() { if (!this.selection_made) return; - - // clear selection - if (this.selected_cell) this.selected_cell.removeClassName("selected"); - + this.clearSelectedClass() if ($R(0,42).include( days_until = this.beginning_date.stripTime().daysDistance(this.selected_date.stripTime()) )) { this.selected_cell = this.calendar_day_grid[days_until]; this.selected_cell.addClassName("selected"); @@ -340,11 +328,12 @@ CalendarDateSelect.prototype = { }, reparse: function() { this.parseDate(); this.refresh(); }, dateString: function() { - return (this.selection_made) ? this.selected_date.toFormattedString(this.use_time) : "&nbsp;"; + return (this.selection_made) ? this.selected_date.toFormattedString(this.use_time) : "&#160;"; }, parseDate: function() { var value = $F(this.target_element).strip() + this.selection_made = (value != ""); this.date = value=="" ? NaN : Date.parseFormattedString(this.options.get("date") || value); if (isNaN(this.date)) this.date = new Date(); if (!this.validYear(this.date.getFullYear())) this.date.setYear( (this.date.getFullYear() < this.yearRange().start) ? this.yearRange().start : this.yearRange().end); @@ -353,6 +342,14 @@ CalendarDateSelect.prototype = { this.date.setDate(1); }, updateFooter:function(text) { if (!text) text = this.dateString(); this.footer_div.purgeChildren(); this.footer_div.build("span", {innerHTML: text }); }, + clearDate:function() { + if ((this.target_element.disabled || this.target_element.readOnly) && this.options.get("popup") != "force") return false; + var last_value = this.target_element.value; + this.target_element.value = ""; + this.clearSelectedClass(); + this.updateFooter('&#160;'); + if (last_value!=this.target_element.value) this.callback("onchange"); + }, updateSelectedDate:function(partsOrElement, via_click) { var parts = $H(partsOrElement); if ((this.target_element.disabled || this.target_element.readOnly) && this.options.get("popup") != "force") return false; @@ -378,12 +375,19 @@ CalendarDateSelect.prototype = { this.setSelectedClass(); if (this.selection_made) this.updateValue(); - if (this.options.get("close_on_click")) { this.close(); } + if (this.closeOnClick()) { this.close(); } if (via_click && !this.options.get("embedded")) { if ((new Date() - this.last_click_at) < 333) this.close(); this.last_click_at = new Date(); } }, + closeOnClick: function() { + if (this.options.get("embedded")) return false; + if (this.options.get("close_on_click")===nil ) + return (this.options.get("time")) ? false : true + else + return (this.options.get("close_on_click")) + }, navMonth: function(month) { (target_date = new Date(this.date)).setMonth(month); return (this.navTo(target_date)); }, navYear: function(year) { (target_date = new Date(this.date)).setYear(year); return (this.navTo(target_date)); }, navTo: function(date) { @@ -426,7 +430,7 @@ CalendarDateSelect.prototype = { Event.stopObserving(document, "keypress", this.keyPress_handler); this.calendar_div.remove(); this.closed = true; if (this.iframe) this.iframe.remove(); - if (this.target_element.type!="hidden") this.target_element.focus(); + if (this.target_element.type != "hidden" && ! this.target_element.disabled) this.target_element.focus(); this.callback("after_close"); }, closeIfClickedOut: function(e) { vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/calendar_date_select.js @@ -8,10 +8,18 @@ Date.prototype.toFormattedString = function(include_time){ return str; } Date.parseFormattedString = function (string) { - var regexp = '([0-9]{1,2})\.(([0-9]{1,2})\.(([0-9]{4})( ([0-9]{1,2}):([0-9]{2})? *)?)?)?'; + var regexp = '([0-9]{1,2})\.(([0-9]{1,2})\.(([0-9]{2,4})( ([0-9]{1,2}):([0-9]{2})? *)?)?)?'; var d = string.match(new RegExp(regexp, "i")); if (d==null) return Date.parse(string); // at least give javascript a crack at it. var offset = 0; + if (d[5] && d[5].length == 2) { + // we got only two digits for the year... + d[5] = Number(d[5]); + if (d[5] > 30) + d[5] += 1900; + else + d[5] += 2000; + } var date = new Date(d[5], 0, 1); if (d[3]) { date.setMonth(d[3] - 1); } if (d[5]) { date.setDate(d[1]); } vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_finnish.js @@ -1,36 +1,36 @@ -Date.prototype.toFormattedString = function(include_time){ - str = this.getFullYear() + "-" + Date.padded2(this.getMonth() + 1) + "-" +Date.padded2(this.getDate()); - -if (include_time) { hour=this.getHours(); str += " " + this.getAMPMHour() + ":" + this.getPaddedMinutes() + " " + this.getAMPM() } -return str; -} - -Date.parseFormattedString = function (string) { - var regexp = "([0-9]{4})(-([0-9]{2})(-([0-9]{2})" + - "( ([0-9]{1,2}):([0-9]{2})? *(pm|am)" + - "?)?)?)?"; - var d = string.match(new RegExp(regexp, "i")); - if (d==null) return Date.parse(string); // at least give javascript a crack at it. - var offset = 0; - var date = new Date(d[1], 0, 1); - if (d[3]) { date.setMonth(d[3] - 1); } - if (d[5]) { date.setDate(d[5]); } - if (d[7]) { - hours = parseInt(d[7], 10); - offset=0; - is_pm = (d[9].toLowerCase()=="pm") - if (is_pm && hours <= 11) hours+=12; - if (!is_pm && hours == 12) hours=0; - date.setHours(hours); - - } - if (d[8]) { date.setMinutes(d[8]); } - if (d[10]) { date.setSeconds(d[10]); } - if (d[12]) { date.setMilliseconds(Number("0." + d[12]) * 1000); } - if (d[14]) { - offset = (Number(d[16]) * 60) + Number(d[17]); - offset *= ((d[15] == '-') ? 1 : -1); - } - - return date; +Date.prototype.toFormattedString = function(include_time){ + str = this.getFullYear() + "-" + Date.padded2(this.getMonth() + 1) + "-" +Date.padded2(this.getDate()); + +if (include_time) { hour=this.getHours(); str += " " + this.getAMPMHour() + ":" + this.getPaddedMinutes() + " " + this.getAMPM() } +return str; +} + +Date.parseFormattedString = function (string) { + var regexp = "([0-9]{4})(-([0-9]{2})(-([0-9]{2})" + + "( ([0-9]{1,2}):([0-9]{2})? *(pm|am)" + + "?)?)?)?"; + var d = string.match(new RegExp(regexp, "i")); + if (d==null) return Date.parse(string); // at least give javascript a crack at it. + var offset = 0; + var date = new Date(d[1], 0, 1); + if (d[3]) { date.setMonth(d[3] - 1); } + if (d[5]) { date.setDate(d[5]); } + if (d[7]) { + hours = parseInt(d[7], 10); + offset=0; + is_pm = (d[9].toLowerCase()=="pm") + if (is_pm && hours <= 11) hours+=12; + if (!is_pm && hours == 12) hours=0; + date.setHours(hours); + + } + if (d[8]) { date.setMinutes(d[8]); } + if (d[10]) { date.setSeconds(d[10]); } + if (d[12]) { date.setMilliseconds(Number("0." + d[12]) * 1000); } + if (d[14]) { + offset = (Number(d[16]) * 60) + Number(d[17]); + offset *= ((d[15] == '-') ? 1 : -1); + } + + return date; } \ No newline at end of file vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_hyphen_ampm.js @@ -3,7 +3,7 @@ Date.prototype.toFormattedString = function(include_time){ str = this.getDate() + "/" + (this.getMonth() + 1) + "/" + this.getFullYear(); - if (include_time) { hour=this.getHours(); str += " " + this.getAMPMHour() + ":" + this.getPaddedMinutes() } + if (include_time) { str += " " + this.getHours() + ":" + this.getPaddedMinutes() } return str; } vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_italian.js @@ -3,3 +3,5 @@ tmtags .emacs-project *~ pkg +doc +email.txt vendor/plugins/rspec-rails/.gitignore @@ -1,64 +1,51 @@ -$:.unshift('lib') -require 'rake' -require 'rake/rdoctask' require 'rubygems' -require 'rake/gempackagetask' +require 'hoe' +require './lib/spec/rails/version' +require 'cucumber/rake/task' -begin - - module Spec - module VERSION - BUILD_TIME_UTC = 'place_holder' - end - end - - require 'spec/rails/version' +$:.unshift(File.join(File.dirname(__FILE__), "/../rspec/lib")) -rescue - # Catch the BUILD_TIME_UTC verification exception. - # This exception is not relevant when running these tasks and hinders the gem installation. -end +require 'spec/rake/spectask' -desc 'Generate RDoc' -rd = Rake::RDocTask.new do |rdoc| - rdoc.rdoc_dir = '../doc/output/rdoc-rails' - rdoc.options << '--title' << 'Spec::Rails' << '--line-numbers' << '--inline-source' << '--main' << 'Spec::Rails' - rdoc.rdoc_files.include('MIT-LICENSE', 'lib/**/*.rb') +class Hoe + def extra_deps + @extra_deps.reject! { |x| Array(x).first == 'hoe' } + @extra_deps + end end -PKG_NAME = "rspec-rails" -PKG_VERSION = Spec::Rails::VERSION::STRING -PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" -PKG_FILES = FileList[ - '[A-Z]*', - 'lib/**/*.rb', - 'spec/**/*', - 'spec_resources/**/*', - 'generators/**/*', - 'stories/**/*', - 'tasks/**/*' -] +Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p| + p.summary = Spec::Rails::VERSION::SUMMARY + p.url = 'http://rspec.info/' + p.description = "Behaviour Driven Development for Ruby on Rails." + p.rubyforge_name = 'rspec' + p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org') + p.extra_deps = [["rspec","1.1.11.4"]] + p.extra_dev_deps = [["cucumber",">= 0.1.13"]] + p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}" +end -rspec_rails = Gem::Specification.new do |s| - s.name = PKG_NAME - s.version = PKG_VERSION - s.summary = Spec::Rails::VERSION::DESCRIPTION - s.description = <<-EOF - rpsec-rails is a Ruby on Rails plugin that allows you to drive the development - of your RoR application using RSpec, a framework that aims to enable BDD in Ruby. - EOF +['audit','test','test_deps','default','post_blog', 'release'].each do |task| + Rake.application.instance_variable_get('@tasks').delete(task) +end - s.files = PKG_FILES.to_a - s.require_path = 'lib' +task :release => [:clean, :package] do |t| + version = ENV["VERSION"] or abort "Must supply VERSION=x.y.z" + abort "Versions don't match #{version} vs #{Spec::Rails::VERSION::STRING}" unless version == Spec::Rails::VERSION::STRING + pkg = "pkg/rspec-rails-#{version}" - s.has_rdoc = true - s.rdoc_options = rd.options + rubyforge = RubyForge.new.configure + puts "Logging in to rubyforge ..." + rubyforge.login - s.author = "RSpec Development Team" - s.email = "rspec-devel@rubyforge.org" - s.homepage = Spec::Rails::VERSION::URL - s.platform = Gem::Platform::RUBY + puts "Releasing rspec-rails version #{version} ..." + ["#{pkg}.gem", "#{pkg}.tgz"].each do |file| + rubyforge.add_file('rspec', 'rspec', Spec::Rails::VERSION::STRING, file) + end end -Rake::GemPackageTask.new(rspec_rails) do |pkg| -end +Spec::Rake::SpecTask.new + +Cucumber::Rake::Task.new + +task :default => [:features] \ No newline at end of file vendor/plugins/rspec-rails/Rakefile @@ -6,6 +6,7 @@ class RspecGenerator < Rails::Generator::Base Config::CONFIG['ruby_install_name']) def initialize(runtime_args, runtime_options = {}) + Dir.mkdir('lib/tasks') unless File.directory?('lib/tasks') super end @@ -13,16 +14,16 @@ class RspecGenerator < Rails::Generator::Base record do |m| script_options = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] } - m.directory 'spec' - m.template 'spec_helper.rb', 'spec/spec_helper.rb' - m.file 'spec.opts', 'spec/spec.opts' - m.file 'rcov.opts', 'spec/rcov.opts' - m.file 'script/spec_server', 'script/spec_server', script_options + m.file 'rspec.rake', 'lib/tasks/rspec.rake' + + m.file 'script/autospec', 'script/autospec', script_options m.file 'script/spec', 'script/spec', script_options + m.file 'script/spec_server', 'script/spec_server', script_options - m.directory 'stories' - m.file 'all_stories.rb', 'stories/all.rb' - m.file 'stories_helper.rb', 'stories/helper.rb' + m.directory 'spec' + m.file 'rcov.opts', 'spec/rcov.opts' + m.file 'spec.opts', 'spec/spec.opts' + m.template 'spec_helper.rb', 'spec/spec_helper.rb' end end vendor/plugins/rspec-rails/generators/rspec/rspec_generator.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib")) +require 'rubygems' require 'spec' exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT)) vendor/plugins/rspec-rails/generators/rspec/templates/script/spec @@ -13,17 +13,21 @@ module Spec def run(argv, stderr, stdout) $stdout = stdout $stderr = stderr - - base = ActiveRecord::Base - def base.clear_reloadable_connections! - active_connections.each do |name, conn| - if conn.requires_reloading? - conn.disconnect! - active_connections.delete(name) + + unless ActiveRecord::Base.respond_to?(:clear_reloadable_connections!) + base = ActiveRecord::Base + def base.clear_reloadable_connections! + active_connections.each do |name, conn| + if conn.requires_reloading? + conn.disconnect! + active_connections.delete(name) + end end end end + ActiveRecord::Base.clear_reloadable_connections! + if ActionController.const_defined?(:Dispatcher) dispatcher = ::ActionController::Dispatcher.new($stdout) dispatcher.cleanup_application @@ -35,8 +39,13 @@ module Spec if Object.const_defined?(:Fixtures) && Fixtures.respond_to?(:reset_cache) Fixtures.reset_cache end + + if ::ActiveSupport.const_defined?(:Dependencies) + ::ActiveSupport::Dependencies.mechanism = :load + else + ::Dependencies.mechanism = :load + end - ::Dependencies.mechanism = :load require_dependency('application.rb') unless Object.const_defined?(:ApplicationController) load File.dirname(__FILE__) + '/../spec/spec_helper.rb' vendor/plugins/rspec-rails/generators/rspec/templates/script/spec_server @@ -43,5 +43,5 @@ Spec::Runner.configure do |config| # # == Notes # - # For more information take a look at Spec::Example::Configuration and Spec::Runner + # For more information take a look at Spec::Runner::Configuration and Spec::Runner end vendor/plugins/rspec-rails/generators/rspec/templates/spec_helper.rb @@ -1,4 +1,5 @@ require 'rails_generator/generators/components/model/model_generator' +require File.dirname(__FILE__) + '/../rspec_default_values' class RspecModelGenerator < ModelGenerator @@ -11,12 +12,16 @@ class RspecModelGenerator < ModelGenerator # Model, spec, and fixture directories. m.directory File.join('app/models', class_path) m.directory File.join('spec/models', class_path) - m.directory File.join('spec/fixtures', class_path) + unless options[:skip_fixture] + m.directory File.join('spec/fixtures', class_path) + end # Model class, spec and fixtures. m.template 'model:model.rb', File.join('app/models', class_path, "#{file_name}.rb") - m.template 'model:fixtures.yml', File.join('spec/fixtures', class_path, "#{table_name}.yml") m.template 'model_spec.rb', File.join('spec/models', class_path, "#{file_name}_spec.rb") + unless options[:skip_fixture] + m.template 'model:fixtures.yml', File.join('spec/fixtures', "#{table_name}.yml") + end unless options[:skip_migration] m.migration_template 'model:migration.rb', 'db/migrate', :assigns => { vendor/plugins/rspec-rails/generators/rspec_model/rspec_model_generator.rb @@ -1,3 +1,5 @@ +require File.dirname(__FILE__) + '/../rspec_default_values' + class RspecScaffoldGenerator < Rails::Generator::NamedBase default_options :skip_migration => false @@ -140,20 +142,6 @@ end module Rails module Generator class GeneratedAttribute - def default_value - @default_value ||= case type - when :int, :integer then "\"1\"" - when :float then "\"1.5\"" - when :decimal then "\"9.99\"" - when :datetime, :timestamp, :time then "Time.now" - when :date then "Date.today" - when :string, :text then "\"value for #{@name}\"" - when :boolean then "false" - else - "" - end - end - def input_type @input_type ||= case type when :text then "textarea" vendor/plugins/rspec-rails/generators/rspec_scaffold/rspec_scaffold_generator.rb @@ -1,327 +1,173 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper') describe <%= controller_class_name %>Controller do - describe "responding to GET /<%= table_name %>" do - before(:each) do - <%= class_name %>.stub!(:find) - end - - def do_get - get :index - end - - it "should succeed" do - do_get - response.should be_success - end - - it "should render the 'index' template" do - do_get - response.should render_template('index') - end - - it "should find all <%= table_name %>" do - <%= class_name %>.should_receive(:find).with(:all).and_return([@<%= file_name %>]) - do_get - end - - it "should assign the found <%= table_name %> for the view" do - <%= class_name %>.should_receive(:find).and_return([<%= file_name %> = mock_model(<%= class_name %>)] ) - do_get - assigns[:<%= table_name %>].should == [<%= file_name %>] - end + def mock_<%= file_name %>(stubs={}) + @mock_<%= file_name %> ||= mock_model(<%= class_name %>, stubs) end - - describe "responding to GET /<%= table_name %>.xml" do - - before(:each) do - <%= class_name %>.stub!(:find) - end - def do_get - @request.env["HTTP_ACCEPT"] = "application/xml" - get :index - end - - it "should succeed" do - do_get - response.should be_success - end + describe "responding to GET index" do - it "should find all <%= table_name %>" do - <%= class_name %>.should_receive(:find).with(:all) - do_get - end - - it "should render the found <%= table_name %> as xml" do - <%= file_name.pluralize %> = mock("Array of <%= class_name.pluralize %>") - <%= class_name %>.should_receive(:find).and_return(<%= file_name.pluralize %>) - <%= file_name.pluralize %>.should_receive(:to_xml).and_return("generated XML") - do_get - response.body.should == "generated XML" + it "should expose all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do + <%= class_name %>.should_receive(:find).with(:all).and_return([mock_<%= file_name %>]) + get :index + assigns[:<%= table_name %>].should == [mock_<%= file_name %>] end - end - describe "responding to GET /<%= table_name %>/1" do - - before(:each) do - <%= class_name %>.stub!(:find) - end + describe "with mime type of xml" do - def do_get(id="1") - get :show, :id => id + it "should render all <%= table_name.pluralize %> as xml" do + request.env["HTTP_ACCEPT"] = "application/xml" + <%= class_name %>.should_receive(:find).with(:all).and_return(<%= file_name.pluralize %> = mock("Array of <%= class_name.pluralize %>")) + <%= file_name.pluralize %>.should_receive(:to_xml).and_return("generated XML") + get :index + response.body.should == "generated XML" + end + end - it "should succeed" do - do_get - response.should be_success - end - - it "should render the 'show' template" do - do_get - response.should render_template('show') - end - - it "should find the <%= file_name %> requested" do - <%= class_name %>.should_receive(:find).with("37") - do_get("37") - end - - it "should assign the found <%= file_name %> for the view" do - <%= class_name %>.should_receive(:find).and_return(<%= file_name %> = mock_model(<%= class_name %>)) - do_get - assigns[:<%= file_name %>].should equal(<%= file_name %>) - end end - describe "responding to GET /<%= table_name %>/1.xml" do + describe "responding to GET show" do - before(:each) do - <%= class_name %>.stub!(:find) - end - - def do_get(id="1") - @request.env["HTTP_ACCEPT"] = "application/xml" - get :show, :id => id + it "should expose the requested <%= file_name %> as @<%= file_name %>" do + <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) + get :show, :id => "37" + assigns[:<%= file_name %>].should equal(mock_<%= file_name %>) end + + describe "with mime type of xml" do + + it "should render the requested <%= file_name %> as xml" do + request.env["HTTP_ACCEPT"] = "application/xml" + <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) + mock_<%= file_name %>.should_receive(:to_xml).and_return("generated XML") + get :show, :id => "37" + response.body.should == "generated XML" + end - it "should succeed" do - do_get - response.should be_success - end - - it "should find the <%= file_name %> requested" do - <%= class_name %>.should_receive(:find).with("37") - do_get("37") - end - - it "should render the found <%= file_name %> as xml" do - <%= file_name %> = mock_model(<%= class_name %>) - <%= class_name %>.should_receive(:find).and_return(<%= file_name %>) - <%= file_name %>.should_receive(:to_xml).and_return("generated XML") - do_get - response.body.should == "generated XML" end + end - describe "responding to GET /<%= table_name %>/new" do - - def do_get + describe "responding to GET new" do + + it "should expose a new <%= file_name %> as @<%= file_name %>" do + <%= class_name %>.should_receive(:new).and_return(mock_<%= file_name %>) get :new + assigns[:<%= file_name %>].should equal(mock_<%= file_name %>) end - it "should succeed" do - do_get - response.should be_success - end - - it "should render the 'new' template" do - do_get - response.should render_template('new') - end - - it "should create an new <%= file_name %>" do - <%= class_name %>.should_receive(:new) - do_get - end - - it "should not save the new <%= file_name %>" do - <%= class_name %>.should_receive(:new).and_return(<%= file_name %> = mock_model(<%= class_name %>)) - <%= file_name %>.should_not_receive(:save) - do_get - end - - it "should assign the new <%= file_name %> for the view" do - <%= class_name %>.should_receive(:new).and_return(<%= file_name %> = mock_model(<%= class_name %>)) - do_get - assigns[:<%= file_name %>].should equal(<%= file_name %>) - end end - describe "responding to GET /<%= table_name %>/1/edit" do - - before(:each) do - <%= class_name %>.stub!(:find) - end + describe "responding to GET edit" do - def do_get - get :edit, :id => "1" + it "should expose the requested <%= file_name %> as @<%= file_name %>" do + <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) + get :edit, :id => "37" + assigns[:<%= file_name %>].should equal(mock_<%= file_name %>) end - it "should succeed" do - do_get - response.should be_success - end - - it "should render the 'edit' template" do - do_get - response.should render_template('edit') - end - - it "should find the <%= file_name %> requested" do - <%= class_name %>.should_receive(:find) - do_get - end - - it "should assign the found <%= class_name %> for the view" do - <%= class_name %>.should_receive(:find).and_return(<%= file_name %> = mock_model(<%= class_name %>)) - do_get - assigns[:<%= file_name %>].should equal(<%= file_name %>) - end end - describe "responding to POST /<%= table_name %>" do + describe "responding to POST create" do - before(:each) do - @<%= file_name %> = mock_model(<%= class_name %>, :to_param => "1") - <%= class_name %>.stub!(:new).and_return(@<%= file_name %>) - end - - describe "with successful save" do - - def do_post - @<%= file_name %>.should_receive(:save).and_return(true) - post :create, :<%= file_name %> => {} - end - - it "should create a new <%= file_name %>" do - <%= class_name %>.should_receive(:new).with({}).and_return(@<%= file_name %>) - do_post - end - - it "should assign the created <%= file_name %> for the view" do - do_post - assigns(:<%= file_name %>).should equal(@<%= file_name %>) + describe "with valid params" do + + it "should expose a newly created <%= file_name %> as @<%= file_name %>" do + <%= class_name %>.should_receive(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => true)) + post :create, :<%= file_name %> => {:these => 'params'} + assigns(:<%= file_name %>).should equal(mock_<%= file_name %>) end it "should redirect to the created <%= file_name %>" do - do_post - response.should redirect_to(<%= table_name.singularize %>_url("1")) + <%= class_name %>.stub!(:new).and_return(mock_<%= file_name %>(:save => true)) + post :create, :<%= file_name %> => {} + response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>)) end end - describe "with failed save" do + describe "with invalid params" do - def do_post - @<%= file_name %>.should_receive(:save).and_return(false) - post :create, :<%= file_name %> => {} - end - - it "should assign the invalid <%= file_name %> for the view" do - do_post - assigns(:<%= file_name %>).should equal(@<%= file_name %>) + it "should expose a newly created but unsaved <%= file_name %> as @<%= file_name %>" do + <%= class_name %>.stub!(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => false)) + post :create, :<%= file_name %> => {:these => 'params'} + assigns(:<%= file_name %>).should equal(mock_<%= file_name %>) end it "should re-render the 'new' template" do - do_post + <%= class_name %>.stub!(:new).and_return(mock_<%= file_name %>(:save => false)) + post :create, :<%= file_name %> => {} response.should render_template('new') end end + end - describe "responding to PUT /<%= table_name %>/1" do + describe "responding to PUT udpate" do - before(:each) do - @<%= file_name %> = mock_model(<%= class_name %>, :to_param => "1") - <%= class_name %>.stub!(:find).and_return(@<%= file_name %>) - end - - describe "with successful update" do - - def do_put - @<%= file_name %>.should_receive(:update_attributes).and_return(true) - put :update, :id => "1" - end + describe "with valid params" do - it "should find the <%= file_name %> requested" do - <%= class_name %>.should_receive(:find).with("1").and_return(@<%= file_name %>) - do_put + it "should update the requested <%= file_name %>" do + <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) + mock_<%= file_name %>.should_receive(:update_attributes).with({'these' => 'params'}) + put :update, :id => "37", :<%= file_name %> => {:these => 'params'} end - it "should update the found <%= file_name %>" do - do_put - assigns(:<%= file_name %>).should equal(@<%= file_name %>) - end - - it "should assign the found <%= file_name %> for the view" do - do_put - assigns(:<%= file_name %>).should equal(@<%= file_name %>) + it "should expose the requested <%= file_name %> as @<%= file_name %>" do + <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => true)) + put :update, :id => "1" + assigns(:<%= file_name %>).should equal(mock_<%= file_name %>) end it "should redirect to the <%= file_name %>" do - do_put - response.should redirect_to(<%= table_name.singularize %>_url("1")) + <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => true)) + put :update, :id => "1" + response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>)) end end - describe "with failed update" do + describe "with invalid params" do - def do_put - @<%= file_name %>.should_receive(:update_attributes).and_return(false) - put :update, :id => "1" + it "should update the requested <%= file_name %>" do + <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) + mock_<%= file_name %>.should_receive(:update_attributes).with({'these' => 'params'}) + put :update, :id => "37", :<%= file_name %> => {:these => 'params'} end - it "should assign the found <%= file_name %> for the view" do - do_put - assigns(:<%= file_name %>).should equal(@<%= file_name %>) + it "should expose the <%= file_name %> as @<%= file_name %>" do + <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => false)) + put :update, :id => "1" + assigns(:<%= file_name %>).should equal(mock_<%= file_name %>) end it "should re-render the 'edit' template" do - do_put + <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => false)) + put :update, :id => "1" response.should render_template('edit') end end - end - describe "responding to DELETE /<%= table_name %>/1" do + end - before(:each) do - @<%= file_name %> = mock_model(<%= class_name %>, :destroy => true) - <%= class_name %>.stub!(:find).and_return(@<%= file_name %>) - end - - def do_delete - delete :destroy, :id => "1" - end + describe "responding to DELETE destroy" do - it "should find the <%= file_name %> requested" do - <%= class_name %>.should_receive(:find).with("1").and_return(@<%= file_name %>) - do_delete - end - - it "should call destroy on the found <%= file_name %>" do - @<%= file_name %>.should_receive(:destroy) - do_delete + it "should destroy the requested <%= file_name %>" do + <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) + mock_<%= file_name %>.should_receive(:destroy) + delete :destroy, :id => "37" end it "should redirect to the <%= table_name %> list" do - do_delete + <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:destroy => true)) + delete :destroy, :id => "1" response.should redirect_to(<%= table_name %>_url) end + end + end vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/controller_spec.rb @@ -1,14 +1,15 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper') +<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%> describe "/<%= table_name %>/edit.<%= default_file_extension %>" do include <%= controller_class_name %>Helper before(:each) do assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %>, - :new_record? => false<%= attributes.empty? ? '' : ',' %> -<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> - :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%> -<% end -%><% end -%> + :new_record? => false<%= output_attributes.empty? ? '' : ',' %> +<% output_attributes.each_with_index do |attribute, attribute_index| -%> + :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == output_attributes.length - 1 ? '' : ','%> +<% end -%> ) end @@ -16,9 +17,9 @@ describe "/<%= table_name %>/edit.<%= default_file_extension %>" do render "/<%= table_name %>/edit.<%= default_file_extension %>" response.should have_tag("form[action=#{<%= file_name %>_path(@<%= file_name %>)}][method=post]") do -<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> +<% for attribute in output_attributes -%> with_tag('<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]', "<%= file_name %>[<%= attribute.name %>]") -<% end -%><% end -%> +<% end -%> end end end vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/edit_erb_spec.rb @@ -1,16 +1,17 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper') +<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%> describe "/<%= table_name %>/index.<%= default_file_extension %>" do include <%= controller_class_name %>Helper before(:each) do assigns[:<%= table_name %>] = [ <% [1,2].each_with_index do |id, model_index| -%> - stub_model(<%= class_name %><%= attributes.empty? ? (model_index == 1 ? ')' : '),') : ',' %> -<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> - :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%> -<% end -%><% end -%> -<% if !attributes.empty? -%> + stub_model(<%= class_name %><%= output_attributes.empty? ? (model_index == 1 ? ')' : '),') : ',' %> +<% output_attributes.each_with_index do |attribute, attribute_index| -%> + :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == output_attributes.length - 1 ? '' : ','%> +<% end -%> +<% if !output_attributes.empty? -%> <%= model_index == 1 ? ')' : '),' %> <% end -%> <% end -%> @@ -19,9 +20,9 @@ describe "/<%= table_name %>/index.<%= default_file_extension %>" do it "should render list of <%= table_name %>" do render "/<%= table_name %>/index.<%= default_file_extension %>" -<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> - response.should have_tag("tr>td", <%= attribute.default_value %>, 2) -<% end -%><% end -%> +<% for attribute in output_attributes -%> + response.should have_tag("tr>td", <%= attribute.default_value %>.to_s, 2) +<% end -%> end end vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/index_erb_spec.rb @@ -1,14 +1,15 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper') +<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%> describe "/<%= table_name %>/new.<%= default_file_extension %>" do include <%= controller_class_name %>Helper before(:each) do assigns[:<%= file_name %>] = stub_model(<%= class_name %>, - :new_record? => true<%= attributes.empty? ? '' : ',' %> -<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> - :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%> -<% end -%><% end -%> + :new_record? => true<%= output_attributes.empty? ? '' : ',' %> +<% output_attributes.each_with_index do |attribute, attribute_index| -%> + :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == output_attributes.length - 1 ? '' : ','%> +<% end -%> ) end @@ -16,9 +17,9 @@ describe "/<%= table_name %>/new.<%= default_file_extension %>" do render "/<%= table_name %>/new.<%= default_file_extension %>" response.should have_tag("form[action=?][method=post]", <%= table_name %>_path) do -<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> +<% for attribute in output_attributes -%> with_tag("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]", "<%= file_name %>[<%= attribute.name %>]") -<% end -%><% end -%> +<% end -%> end end end vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/new_erb_spec.rb @@ -2,59 +2,57 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_dep describe <%= controller_class_name %>Controller do describe "route generation" do - - it "should map { :controller => '<%= table_name %>', :action => 'index' } to /<%= table_name %>" do + it "should map #index" do route_for(:controller => "<%= table_name %>", :action => "index").should == "/<%= table_name %>" end - it "should map { :controller => '<%= table_name %>', :action => 'new' } to /<%= table_name %>/new" do + it "should map #new" do route_for(:controller => "<%= table_name %>", :action => "new").should == "/<%= table_name %>/new" end - it "should map { :controller => '<%= table_name %>', :action => 'show', :id => 1 } to /<%= table_name %>/1" do + it "should map #show" do route_for(:controller => "<%= table_name %>", :action => "show", :id => 1).should == "/<%= table_name %>/1" end - it "should map { :controller => '<%= table_name %>', :action => 'edit', :id => 1 } to /<%= table_name %>/1<%= resource_edit_path %>" do + it "should map #edit" do route_for(:controller => "<%= table_name %>", :action => "edit", :id => 1).should == "/<%= table_name %>/1<%= resource_edit_path %>" end - it "should map { :controller => '<%= table_name %>', :action => 'update', :id => 1} to /<%= table_name %>/1" do + it "should map #update" do route_for(:controller => "<%= table_name %>", :action => "update", :id => 1).should == "/<%= table_name %>/1" end - it "should map { :controller => '<%= table_name %>', :action => 'destroy', :id => 1} to /<%= table_name %>/1" do + it "should map #destroy" do route_for(:controller => "<%= table_name %>", :action => "destroy", :id => 1).should == "/<%= table_name %>/1" end end describe "route recognition" do - - it "should generate params { :controller => '<%= table_name %>', action => 'index' } from GET /<%= table_name %>" do + it "should generate params for #index" do params_from(:get, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "index"} end - it "should generate params { :controller => '<%= table_name %>', action => 'new' } from GET /<%= table_name %>/new" do + it "should generate params for #new" do params_from(:get, "/<%= table_name %>/new").should == {:controller => "<%= table_name %>", :action => "new"} end - it "should generate params { :controller => '<%= table_name %>', action => 'create' } from POST /<%= table_name %>" do + it "should generate params for #create" do params_from(:post, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "create"} end - it "should generate params { :controller => '<%= table_name %>', action => 'show', id => '1' } from GET /<%= table_name %>/1" do + it "should generate params for #show" do params_from(:get, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "show", :id => "1"} end - it "should generate params { :controller => '<%= table_name %>', action => 'edit', id => '1' } from GET /<%= table_name %>/1;edit" do + it "should generate params for #edit" do params_from(:get, "/<%= table_name %>/1<%= resource_edit_path %>").should == {:controller => "<%= table_name %>", :action => "edit", :id => "1"} end - it "should generate params { :controller => '<%= table_name %>', action => 'update', id => '1' } from PUT /<%= table_name %>/1" do + it "should generate params for #update" do params_from(:put, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "update", :id => "1"} end - it "should generate params { :controller => '<%= table_name %>', action => 'destroy', id => '1' } from DELETE /<%= table_name %>/1" do + it "should generate params for #destroy" do params_from(:delete, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "destroy", :id => "1"} end end vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/routing_spec.rb @@ -1,23 +1,23 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper') +<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%> describe "/<%= table_name %>/show.<%= default_file_extension %>" do include <%= controller_class_name %>Helper - before(:each) do - assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %><%= attributes.empty? ? ')' : ',' %> -<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> - :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%> -<% end -%><% end -%> -<% if !attributes.empty? -%> + assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %><%= output_attributes.empty? ? ')' : ',' %> +<% output_attributes.each_with_index do |attribute, attribute_index| -%> + :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == output_attributes.length - 1 ? '' : ','%> +<% end -%> +<% if !output_attributes.empty? -%> ) <% end -%> end it "should render attributes in <p>" do render "/<%= table_name %>/show.<%= default_file_extension %>" -<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> - response.should have_text(/<%= Regexp.escape(attribute.default_value)[1..-2]%>/) -<% end -%><% end -%> +<% for attribute in output_attributes -%> + response.should have_text(/<%= Regexp.escape(attribute.default_value).gsub(/^"|"$/, '')%>/) +<% end -%> end end vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/show_erb_spec.rb @@ -73,9 +73,4 @@ Autotest.add_hook :initialize do |at| end class Autotest::RailsRspec < Autotest::Rspec - - def spec_command - "script/spec" - end - end vendor/plugins/rspec-rails/lib/autotest/rails_rspec.rb @@ -1,6 +1,11 @@ silence_warnings { RAILS_ENV = "test" } -require 'application' +begin + require_dependency 'application_controller' +rescue MissingSourceFile + require_dependency 'application' +end + require 'action_controller/test_process' require 'action_controller/integration' require 'active_record/fixtures' if defined?(ActiveRecord::Base) @@ -12,41 +17,4 @@ require 'spec/rails/matchers' require 'spec/rails/mocks' require 'spec/rails/example' require 'spec/rails/extensions' -require 'spec/rails/version' - -module Spec - # = Spec::Rails - # - # Spec::Rails (a.k.a. RSpec on Rails) is a Ruby on Rails plugin that allows you to drive the development - # of your RoR application using RSpec, a framework that aims to enable Example Driven Development - # in Ruby. - # - # == Features - # - # * Use RSpec to independently specify Rails Models, Views, Controllers and Helpers - # * Integrated fixture loading - # * Special generators for Resources, Models, Views and Controllers that generate Specs instead of Tests. - # - # == Vision - # - # For people for whom TDD is a brand new concept, the testing support built into Ruby on Rails - # is a huge leap forward. The fact that it is built right in is fantastic, and Ruby on Rails - # apps are generally much easier to maintain than they might have been without such support. - # - # For those of us coming from a history with TDD, and now BDD, the existing support presents some problems related to dependencies across specs. To that end, RSpec on Rails supports 4 types of specs. We’ve also built in first class mocking and stubbing support in order to break dependencies across these different concerns. - # - # == More Information - # - # See Spec::Rails::Runner for information about the different kinds of contexts - # you can use to spec the different Rails components - # - # See Spec::Rails::Expectations for information about Rails-specific expectations - # you can set on responses and models, etc. - # - # == License - # - # RSpec on Rails is licensed under the same license as RSpec itself, - # the MIT-LICENSE. - module Rails - end -end +require 'spec/rails/interop/testcase' \ No newline at end of file vendor/plugins/rspec-rails/lib/spec/rails.rb @@ -9,6 +9,7 @@ require "spec/rails/example/functional_example_group" require "spec/rails/example/controller_example_group" require "spec/rails/example/helper_example_group" require "spec/rails/example/view_example_group" +require "spec/rails/example/cookies_proxy" module Spec module Rails vendor/plugins/rspec-rails/lib/spec/rails/example.rb @@ -2,27 +2,24 @@ module Spec module Rails module Example class AssignsHashProxy #:nodoc: - def initialize(object) - @object = object + def initialize(example_group, &block) + @target = block.call + @example_group = example_group end - def [](ivar) - if assigns.include?(ivar.to_s) - assigns[ivar.to_s] - elsif assigns.include?(ivar) - assigns[ivar] - else - nil - end + def [](key) + return false if assigns[key] == false + return false if assigns[key.to_s] == false + assigns[key] || assigns[key.to_s] || @target.instance_variable_get("@#{key}") end - def []=(ivar, val) - @object.instance_variable_set "@#{ivar}", val - assigns[ivar.to_s] = val + def []=(key, val) + @target.instance_variable_set("@#{key}", val) end - def delete(name) - assigns.delete(name.to_s) + def delete(key) + assigns.delete(key.to_s) + @target.instance_variable_set("@#{key}", nil) end def each(&block) @@ -35,7 +32,7 @@ module Spec protected def assigns - @object.assigns + @example_group.orig_assigns end end end vendor/plugins/rspec-rails/lib/spec/rails/example/assigns_hash_proxy.rb @@ -125,7 +125,7 @@ module Spec attr_reader :response, :request, :controller - def initialize(defined_description, &implementation) #:nodoc: + def initialize(defined_description, options={}, &implementation) #:nodoc: super controller_class_name = self.class.controller_class_name if controller_class_name @@ -158,7 +158,9 @@ module Spec protected def _assigns_hash_proxy - @_assigns_hash_proxy ||= AssignsHashProxy.new @controller + @_assigns_hash_proxy ||= AssignsHashProxy.new self do + @response.template + end end private @@ -183,61 +185,49 @@ module Spec unless integrate_views? if @template.respond_to?(:finder) (class << @template.finder; self; end).class_eval do - define_method :file_exists? do - true - end + define_method :file_exists? do; true; end end else (class << @template; self; end).class_eval do - define_method :file_exists? do - true - end + define_method :file_exists? do; true; end end end (class << @template; self; end).class_eval do define_method :render_file do |*args| - @first_render ||= args[0] + @first_render ||= args[0] unless args[0] =~ /^layouts/ + @_first_render ||= args[0] unless args[0] =~ /^layouts/ + end + + define_method :_pick_template do |*args| + @_first_render ||= args[0] unless args[0] =~ /^layouts/ + PickedTemplate.new + end + + define_method :render do |*args| + if @_rendered + opts = args[0] + (@_rendered[:template] ||= opts[:file]) if opts[:file] + (@_rendered[:partials][opts[:partial]] += 1) if opts[:partial] + else + super + end end end end end if matching_message_expectation_exists(options) - expect_render_mock_proxy.render(options, &block) + render_proxy.render(options, &block) @performed_render = true else - unless matching_stub_exists(options) + if matching_stub_exists(options) + @performed_render = true + else super(options, deprecated_status_or_extra_options, &block) end end end - def raise_with_disable_message(old_method, new_method) - raise %Q| - controller.#{old_method}(:render) has been disabled because it - can often produce unexpected results. Instead, you should - use the following (before the action): - - controller.#{new_method}(*args) - - See the rdoc for #{new_method} for more information. - | - end - def should_receive(*args) - if args[0] == :render - raise_with_disable_message("should_receive", "expect_render") - else - super - end - end - def stub!(*args) - if args[0] == :render - raise_with_disable_message("stub!", "stub_render") - else - super - end - end - def response(&block) # NOTE - we're setting @update for the assert_select_spec - kinda weird, huh? @update = block @@ -255,17 +245,25 @@ module Spec end def matching_message_expectation_exists(options) - expect_render_mock_proxy.send(:__mock_proxy).send(:find_matching_expectation, :render, options) + render_proxy.send(:__mock_proxy).send(:find_matching_expectation, :render, options) end def matching_stub_exists(options) - expect_render_mock_proxy.send(:__mock_proxy).send(:find_matching_method_stub, :render, options) + render_proxy.send(:__mock_proxy).send(:find_matching_method_stub, :render, options) end end Spec::Example::ExampleGroupFactory.register(:controller, self) end + + # Returned by _pick_template when running controller examples in isolation mode. + class PickedTemplate + # Do nothing when running controller examples in isolation mode. + def render_template(*ignore_args); end + # Do nothing when running controller examples in isolation mode. + def render_partial(*ignore_args); end + end end end end vendor/plugins/rspec-rails/lib/spec/rails/example/controller_example_group.rb @@ -7,7 +7,7 @@ module Spec attr_reader :request, :response before(:each) do - @controller_class = Object.path2class @controller_class_name + @controller_class = @controller_class_name.split('::').inject(Object) { |k,n| k.const_get n } raise "Can't determine controller class for #{@controller_class_name}" if @controller_class.nil? @controller = @controller_class.new @@ -15,18 +15,57 @@ module Spec @response = ActionController::TestResponse.new @response.session = @request.session end - + def params request.parameters end def flash - response.flash + @controller.__send__ :flash end def session response.session end + + # Overrides the <tt>cookies()</tt> method in + # ActionController::TestResponseBehaviour, returning a proxy that + # accesses the requests cookies when setting a cookie and the + # responses cookies when reading one. This allows you to set and read + # cookies in examples using the same API with which you set and read + # them in controllers. + # + # == Examples (Rails >= 1.2.6) + # + # cookies[:user_id] = '1234' + # get :index + # assigns[:user].id.should == '1234' + # + # post :login + # cookies[:login].expires.should == 1.week.from_now + # + # == Examples (Rails 2.0 > 2.2) + # + # cookies[:user_id] = {:value => '1234', :expires => 1.minute.ago} + # get :index + # response.should be_redirect + # + # == Examples (Rails 2.3) + # + # Rails 2.3 changes the way cookies are made available to functional + # tests (and therefore rspec controller specs), only making single + # values available with no access to other aspects of the cookie. This + # is backwards-incompatible, so you have to change your examples to + # look like this: + # + # cookies[:foo] = 'bar' + # get :index + # cookies[:foo].should == 'bar' + def cookies + @cookies ||= Spec::Rails::Example::CookiesProxy.new(self) + end + + alias_method :orig_assigns, :assigns # :call-seq: # assigns() @@ -44,7 +83,7 @@ module Spec # assigns[:registration].should == Thing.new #-- # NOTE - Even though docs only use assigns[:key] format, this supports - # assigns(:key) in order to avoid breaking old specs. + # assigns(:key) for backwards compatibility. #++ def assigns(key = nil) if key.nil? @@ -53,6 +92,7 @@ module Spec _assigns_hash_proxy[key] end end + end end end vendor/plugins/rspec-rails/lib/spec/rails/example/functional_example_group.rb @@ -96,7 +96,11 @@ module Spec def helper self.class.helper end - + + def orig_assigns + helper.assigns + end + # Reverse the load order so that custom helpers which are defined last # are also loaded last. ActionView::Base.included_modules.reverse.each do |mod| @@ -148,7 +152,9 @@ module Spec protected def _assigns_hash_proxy - @_assigns_hash_proxy ||= AssignsHashProxy.new helper + @_assigns_hash_proxy ||= AssignsHashProxy.new self do + helper + end end end vendor/plugins/rspec-rails/lib/spec/rails/example/helper_example_group.rb @@ -8,22 +8,21 @@ module Spec module Rails module Example - class RailsExampleGroup < Test::Unit::TestCase - - # Rails >= r8570 uses setup/teardown_fixtures explicitly - before(:each) do - setup_fixtures if self.respond_to?(:setup_fixtures) + if ActiveSupport.const_defined?(:TestCase) + class RailsExampleGroup < ActiveSupport::TestCase + include ActionController::Assertions::SelectorAssertions end - after(:each) do - teardown_fixtures if self.respond_to?(:teardown_fixtures) + else + class RailsExampleGroup < Test::Unit::TestCase end - + end + + class RailsExampleGroup include Spec::Rails::Matchers include Spec::Rails::Mocks - Spec::Example::ExampleGroupFactory.default(self) - end + end end end vendor/plugins/rspec-rails/lib/spec/rails/example/rails_example_group.rb @@ -3,61 +3,39 @@ require 'spec/mocks/framework' module Spec module Rails module Example - # Provides specialized mock-like behaviour for controller and view examples, - # allowing you to mock or stub calls to render with specific arguments while - # ignoring all other calls. + # Extends the #should_receive, #should_not_receive and #stub! methods in rspec's + # mocking framework to handle #render calls to controller in controller examples + # and template and view examples module RenderObserver - # Similar to mocking +render+ with the exception that calls to +render+ with - # any other options are passed on to the receiver (i.e. controller in - # controller examples, template in view examples). - # - # This is necessary because Rails uses the +render+ method on both - # controllers and templates as a dispatcher to render different kinds of - # things, sometimes resulting in many calls to the render method within one - # request. This approach makes it impossible to use a normal mock object, which - # is designed to observe all incoming messages with a given name. - # - # +expect_render+ is auto-verifying, so failures will be reported without - # requiring you to explicitly request verification. - # - # Also, +expect_render+ uses parts of RSpec's mock expectation framework. Because - # it wraps only a subset of the framework, using this will create no conflict with - # other mock frameworks if you choose to use them. Additionally, the object returned - # by expect_render is an RSpec mock object, which means that you can call any of the - # chained methods available in RSpec's mocks. - # - # == Controller Examples - # - # controller.expect_render(:partial => 'thing', :object => thing) - # controller.expect_render(:partial => 'thing', :collection => things).once - # - # controller.stub_render(:partial => 'thing', :object => thing) - # controller.stub_render(:partial => 'thing', :collection => things).twice - # - # == View Examples - # - # template.expect_render(:partial => 'thing', :object => thing) - # template.expect_render(:partial => 'thing', :collection => things) - # - # template.stub_render(:partial => 'thing', :object => thing) - # template.stub_render(:partial => 'thing', :collection => things) + # DEPRECATED # + # Use should_receive(:render).with(opts) instead def expect_render(opts={}) + warn_deprecation("expect_render", "should_receive") register_verify_after_each - expect_render_mock_proxy.should_receive(:render, :expected_from => caller(1)[0]).with(opts) + render_proxy.should_receive(:render, :expected_from => caller(1)[0]).with(opts) end - # This is exactly like expect_render, with the exception that the call to render will not - # be verified. Use this if you are trying to isolate your example from a complicated render - # operation but don't care whether it is called or not. + # DEPRECATED + # + # Use stub!(:render).with(opts) instead def stub_render(opts={}) + warn_deprecation("stub_render", "stub!") register_verify_after_each - expect_render_mock_proxy.stub!(:render, :expected_from => caller(1)[0]).with(opts) + render_proxy.stub!(:render, :expected_from => caller(1)[0]).with(opts) + end + + def warn_deprecation(deprecated_method, new_method) + Kernel.warn <<-WARNING +#{deprecated_method} is deprecated and will be removed from a future version of rspec-rails. + +Please just use object.#{new_method} instead. +WARNING end def verify_rendered # :nodoc: - expect_render_mock_proxy.rspec_verify + render_proxy.rspec_verify end def unregister_verify_after_each #:nodoc: @@ -65,7 +43,32 @@ module Spec Spec::Example::ExampleGroup.remove_after(:each, &proc) end - protected + def should_receive(*args) + if args[0] == :render + register_verify_after_each + render_proxy.should_receive(:render, :expected_from => caller(1)[0]) + else + super + end + end + + def should_not_receive(*args) + if args[0] == :render + register_verify_after_each + render_proxy.should_not_receive(:render) + else + super + end + end + + def stub!(*args) + if args[0] == :render + register_verify_after_each + render_proxy.stub!(:render, :expected_from => caller(1)[0]) + else + super + end + end def verify_rendered_proc #:nodoc: template = self @@ -80,8 +83,8 @@ module Spec Spec::Example::ExampleGroup.after(:each, &proc) end - def expect_render_mock_proxy #:nodoc: - @expect_render_mock_proxy ||= Spec::Mocks::Mock.new("expect_render_mock_proxy") + def render_proxy #:nodoc: + @render_proxy ||= Spec::Mocks::Mock.new("render_proxy") end end vendor/plugins/rspec-rails/lib/spec/rails/example/render_observer.rb @@ -32,7 +32,7 @@ module Spec ensure_that_base_view_path_is_not_set_across_example_groups end - def initialize(defined_description, &implementation) #:nodoc: + def initialize(defined_description, options={}, &implementation) #:nodoc: super @controller_class_name = "Spec::Rails::Example::ViewExampleGroupController" end @@ -63,7 +63,7 @@ module Spec def derived_action_name(options) #:nodoc: parts = subject_of_render(options).split('/').reject { |part| part.empty? } - "#{parts.last}" + "#{parts.last}".split('.').first end def subject_of_render(options) #:nodoc: @@ -103,11 +103,11 @@ module Spec add_helpers(options) assigns[:action_name] = @action_name - - @request.path_parameters = { - :controller => derived_controller_name(options), - :action => derived_action_name(options) - } + + @request.path_parameters = @request.path_parameters.merge( + :controller => derived_controller_name(options), + :action => derived_action_name(options) + ).merge(options[:path_parameters] || {}) defaults = { :layout => false } options = defaults.merge options @@ -150,7 +150,9 @@ module Spec protected def _assigns_hash_proxy - @_assigns_hash_proxy ||= AssignsHashProxy.new @controller + @_assigns_hash_proxy ||= AssignsHashProxy.new self do + @response.template + end end end @@ -172,6 +174,9 @@ module Spec include helper_module end end + + def forget_variables_added_to_assigns + end end end end vendor/plugins/rspec-rails/lib/spec/rails/example/view_example_group.rb @@ -1,8 +1,6 @@ require 'spec' -require 'spec/rails/extensions/object' - -require 'spec/rails/extensions/spec/example/configuration' +require 'spec/rails/extensions/spec/runner/configuration' require 'spec/rails/extensions/spec/matchers/have' require 'spec/rails/extensions/active_record/base' vendor/plugins/rspec-rails/lib/spec/rails/extensions.rb @@ -2,7 +2,7 @@ module ActionController class Base class << self def set_view_path(path) - [:append_view_path, :view_paths=, :template_root=].each do |method| + [:append_view_path, :template_root=].each do |method| if respond_to?(method) return send(method, path) end vendor/plugins/rspec-rails/lib/spec/rails/extensions/action_controller/base.rb @@ -5,7 +5,16 @@ module ActionController #:nodoc: def capture(name) template.instance_variable_get "@content_for_#{name.to_s}" end - alias [] capture - + + if ::Rails::VERSION::STRING < "2.3" + def [](name) + Kernel.warn <<-WARNING +[](name) as an alias for capture(name) (TestResponse extension in rspec-rails) +is deprecated and will be removed in the rspec-rails release that follows the +rails-2.3.0 release. +WARNING + capture(name) + end + end end end vendor/plugins/rspec-rails/lib/spec/rails/extensions/action_controller/test_response.rb @@ -2,6 +2,8 @@ module ActionView #:nodoc: class Base #:nodoc: include Spec::Rails::Example::RenderObserver cattr_accessor :base_view_path + + alias_method :orig_render_partial, :render_partial def render_partial(partial_path, local_assigns = nil, deprecated_local_assigns = nil) #:nodoc: if partial_path.is_a?(String) unless partial_path.include?("/") @@ -10,15 +12,19 @@ module ActionView #:nodoc: end end end - super(partial_path, local_assigns, deprecated_local_assigns) + begin + orig_render_partial(partial_path, local_assigns, deprecated_local_assigns) + rescue ArgumentError # edge rails > 2.1 changed render_partial to accept only one arg + orig_render_partial(partial_path) + end end alias_method :orig_render, :render def render(options = {}, old_local_assigns = {}, &block) - if expect_render_mock_proxy.send(:__mock_proxy).send(:find_matching_expectation, :render, options) - expect_render_mock_proxy.render(options) + if render_proxy.send(:__mock_proxy).send(:find_matching_expectation, :render, options) + render_proxy.render(options) else - unless expect_render_mock_proxy.send(:__mock_proxy).send(:find_matching_method_stub, :render, options) + unless render_proxy.send(:__mock_proxy).send(:find_matching_method_stub, :render, options) orig_render(options, old_local_assigns, &block) end end vendor/plugins/rspec-rails/lib/spec/rails/extensions/action_view/base.rb @@ -1,8 +1,7 @@ if defined?(ActiveRecord::Base) module ActiveRecord #:nodoc: class Base - - (class << self; self; end).class_eval do + class << self # Extension for <tt>should have</tt> on AR Model classes # # ModelClass.should have(:no).records vendor/plugins/rspec-rails/lib/spec/rails/extensions/active_record/base.rb @@ -5,8 +5,8 @@ module Spec #:nodoc: class Have #:nodoc: alias_method :__original_failure_message, :failure_message def failure_message - return "expected #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}, got #{@actual}" if @collection_name == :errors_on - return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@actual}" if @collection_name == :error_on + return "expected #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}, got #{@given}" if @collection_name == :errors_on + return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@given}" if @collection_name == :error_on return __original_failure_message end vendor/plugins/rspec-rails/lib/spec/rails/extensions/spec/matchers/have.rb @@ -1,5 +1,7 @@ dir = File.dirname(__FILE__) +require 'spec/rails/matchers/ar_be_valid' require 'spec/rails/matchers/assert_select' +require 'spec/rails/matchers/change' require 'spec/rails/matchers/have_text' require 'spec/rails/matchers/include_text' require 'spec/rails/matchers/redirect_to' vendor/plugins/rspec-rails/lib/spec/rails/matchers.rb @@ -16,6 +16,7 @@ module Spec # :nodoc: def matches?(response_or_text, &block) if ActionController::TestResponse === response_or_text and response_or_text.headers.key?('Content-Type') and + !response_or_text.headers['Content-Type'].blank? and response_or_text.headers['Content-Type'].to_sym == :xml @args.unshift(HTML::Document.new(response_or_text.body, false, true).root) elsif String === response_or_text vendor/plugins/rspec-rails/lib/spec/rails/matchers/assert_select.rb @@ -74,13 +74,15 @@ module Spec end def description - "redirect to #{@actual.inspect}" + "redirect to #{@expected.inspect}" end class QueryParameterParser def self.parse_query_parameters(query, request) if defined?(CGIMethods) CGIMethods.parse_query_parameters(query) + elsif defined?(ActionController::RequestParser) + ActionController::RequestParser.parse_query_parameters(query) else request.class.parse_query_parameters(query) end vendor/plugins/rspec-rails/lib/spec/rails/matchers/redirect_to.rb @@ -10,10 +10,28 @@ module Spec end def matches?(response) - @actual = response.rendered_file - full_path(@actual) == full_path(@expected) + if response.respond_to?(:rendered_file) + @actual = response.rendered_file + elsif response.respond_to?(:rendered) + case template = response.rendered[:template] + when nil + unless response.rendered[:partials].empty? + @actual = path_and_file(response.rendered[:partials].keys.first).join("/_") + end + when ActionView::Template + @actual = template.path + when String + @actual = template + end + else + @actual = response.rendered_template.to_s + end + return false if @actual.blank? + given_controller_path, given_file = path_and_file(@actual) + expected_controller_path, expected_file = path_and_file(@expected) + given_controller_path == expected_controller_path && given_file.match(expected_file) end - + def failure_message "expected #{@expected.inspect}, got #{@actual.inspect}" end @@ -27,22 +45,43 @@ module Spec end private - def full_path(path) - return nil if path.nil? - path.include?('/') ? path : "#{@controller.class.to_s.underscore.gsub('_controller','')}/#{path}" + def path_and_file(path) + parts = path.split('/') + file = parts.pop + controller = parts.empty? ? current_controller_path : parts.join('/') + return controller, file end - end + def controller_path_from(path) + parts = path.split('/') + parts.pop + parts.join('/') + end + def current_controller_path + @controller.class.to_s.underscore.gsub(/_controller$/,'') + end + + end + # :call-seq: - # response.should render_template(path) - # response.should_not render_template(path) + # response.should render_template(template) + # response.should_not render_template(template) + # + # For use in controller code examples (integration or isolation mode). + # + # Passes if the specified template (view file) is rendered by the + # response. This file can be any view file, including a partial. However + # if it is a partial it must be rendered directly i.e. you can't detect + # that a partial has been rendered as part of a view using + # render_template. For that you should use a message expectation + # (mock) instead: # - # Passes if the specified template is rendered by the response. - # Useful in controller specs (integration or isolation mode). + # controller.should_receive(:render).with(:partial => 'path/to/partial') # - # <code>path</code> can include the controller path or not. It - # can also include an optional extension (no extension assumes .rhtml). + # <code>template</code> can include the controller path. It can also + # include an optional extension, which you only need to use when there + # is ambiguity. # # Note that partials must be spelled with the preceding underscore. # @@ -52,12 +91,13 @@ module Spec # response.should render_template('same_controller/list') # response.should render_template('other_controller/list') # - # #rjs + # # with extensions # response.should render_template('list.rjs') + # response.should render_template('list.haml') # response.should render_template('same_controller/list.rjs') # response.should render_template('other_controller/list.rjs') # - # #partials + # # partials # response.should render_template('_a_partial') # response.should render_template('same_controller/_a_partial') # response.should render_template('other_controller/_a_partial') vendor/plugins/rspec-rails/lib/spec/rails/matchers/render_template.rb @@ -9,15 +9,21 @@ module Spec # methods stubbed out. Additional methods may be easily stubbed (via # add_stubs) if +stubs+ is passed. def mock_model(model_class, options_and_stubs = {}) - id = next_id - options_and_stubs.reverse_merge!({ + id = options_and_stubs[:id] || next_id + options_and_stubs = options_and_stubs.reverse_merge({ :id => id, :to_param => id.to_s, :new_record? => false, :errors => stub("errors", :count => 0) }) - m = mock("#{model_class.name}_#{options_and_stubs[:id]}", options_and_stubs) + m = mock("#{model_class.name}_#{id}", options_and_stubs) m.send(:__mock_proxy).instance_eval <<-CODE + def @target.as_new_record + self.stub!(:id).and_return nil + self.stub!(:to_param).and_return nil + self.stub!(:new_record?).and_return true + self + end def @target.is_a?(other) #{model_class}.ancestors.include?(other) end @@ -98,21 +104,24 @@ module Spec model[k] = stubs.delete(k) end end - add_stubs(model, stubs) + model.stub!(stubs) yield model if block_given? end end - #-- - # TODO - Shouldn't this just be an extension of stub! ?? - # - object.stub!(:method => return_value, :method2 => return_value2, :etc => etc) - #++ + # DEPRECATED - use object.stub!(:method => value, :method2 => value) + # # Stubs methods on +object+ (if +object+ is a symbol or string a new mock # with that name will be created). +stubs+ is a Hash of +method=>value+ def add_stubs(object, stubs = {}) #:nodoc: - m = [String, Symbol].index(object.class) ? mock(object.to_s) : object - stubs.each {|k,v| m.stub!(k).and_return(v)} - m + Kernel.warn <<-WARNING +DEPRECATION NOTICE: add_stubs is deprecated and will be removed +from a future version of rspec-rails. Use this instead: + + object.stub!(:method => value, :method2 => value) + +WARNING + object.stub!(stubs) end private @@ -123,4 +132,4 @@ module Spec end end -end \ No newline at end of file +end vendor/plugins/rspec-rails/lib/spec/rails/mocks.rb @@ -40,15 +40,23 @@ class ActiveRecordSafetyListener include Singleton def scenario_started(*args) if defined?(ActiveRecord::Base) - ActiveRecord::Base.send :increment_open_transactions unless Rails::VERSION::STRING == "1.1.6" - ActiveRecord::Base.connection.begin_db_transaction + if ActiveRecord::Base.connection.respond_to?(:increment_open_transactions) + ActiveRecord::Base.connection.increment_open_transactions + else + ActiveRecord::Base.send :increment_open_transactions + end end + ActiveRecord::Base.connection.begin_db_transaction end def scenario_succeeded(*args) if defined?(ActiveRecord::Base) ActiveRecord::Base.connection.rollback_db_transaction - ActiveRecord::Base.send :decrement_open_transactions unless Rails::VERSION::STRING == "1.1.6" + if ActiveRecord::Base.connection.respond_to?(:decrement_open_transactions) + ActiveRecord::Base.connection.decrement_open_transactions + else + ActiveRecord::Base.send :decrement_open_transactions + end end end alias :scenario_pending :scenario_succeeded vendor/plugins/rspec-rails/lib/spec/rails/story_adapter.rb @@ -1,39 +1,16 @@ -module Spec - module Rails - module VERSION #:nodoc: - unless defined? MAJOR - MAJOR = 1 - MINOR = 1 - TINY = 4 - RELEASE_CANDIDATE = nil - - BUILD_TIME_UTC = 20080628203842 - - STRING = [MAJOR, MINOR, TINY].join('.') - TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_') - FULL_VERSION = "#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('.')} (build #{BUILD_TIME_UTC})" - - NAME = "RSpec-Rails" - URL = "http://github.com/dchelimsky/rspec-rails" - - DESCRIPTION = "#{NAME}-#{FULL_VERSION} - BDD for Ruby on Rails\n#{URL}" - end - end - end -end - -# Verify that the plugin has the same revision as RSpec -if Spec::Rails::VERSION::BUILD_TIME_UTC != Spec::VERSION::BUILD_TIME_UTC - raise <<-EOF - -############################################################################ -Your RSpec on Rails plugin is incompatible with your installed RSpec. - -RSpec : #{Spec::VERSION::BUILD_TIME_UTC} -RSpec on Rails : #{Spec::Rails::VERSION::BUILD_TIME_UTC} - -Make sure your RSpec on Rails plugin is compatible with your RSpec gem. -See http://rspec.rubyforge.org/documentation/rails/install.html for details. -############################################################################ -EOF -end +module Spec + module Rails + module VERSION #:nodoc: + unless defined? MAJOR + MAJOR = 1 + MINOR = 1 + TINY = 11 + MINESCULE = 4 + + STRING = [MAJOR, MINOR, TINY, MINESCULE].join('.') + + SUMMARY = "rspec-rails #{STRING}" + end + end + end +end \ No newline at end of file vendor/plugins/rspec-rails/lib/spec/rails/version.rb @@ -1,24 +1,35 @@ dir = File.dirname(__FILE__) $LOAD_PATH.unshift(File.expand_path("#{dir}/../rspec/lib")) -$LOAD_PATH.unshift(File.expand_path("#{dir}/../spec_resources/controllers")) -$LOAD_PATH.unshift(File.expand_path("#{dir}/../spec_resources/helpers")) +$LOAD_PATH.unshift(File.expand_path("#{dir}/resources/controllers")) +$LOAD_PATH.unshift(File.expand_path("#{dir}/resources/helpers")) require File.expand_path("#{dir}/../../../../spec/spec_helper") -require File.expand_path("#{dir}/../spec_resources/controllers/render_spec_controller") -require File.expand_path("#{dir}/../spec_resources/controllers/rjs_spec_controller") -require File.expand_path("#{dir}/../spec_resources/controllers/redirect_spec_controller") -require File.expand_path("#{dir}/../spec_resources/controllers/action_view_base_spec_controller") -require File.expand_path("#{dir}/../spec_resources/helpers/explicit_helper") -require File.expand_path("#{dir}/../spec_resources/helpers/more_explicit_helper") -require File.expand_path("#{dir}/../spec_resources/helpers/view_spec_helper") -require File.expand_path("#{dir}/../spec_resources/helpers/plugin_application_helper") +require File.expand_path("#{dir}/resources/controllers/application") +require File.expand_path("#{dir}/resources/controllers/render_spec_controller") +require File.expand_path("#{dir}/resources/controllers/rjs_spec_controller") +require File.expand_path("#{dir}/resources/controllers/redirect_spec_controller") +require File.expand_path("#{dir}/resources/controllers/action_view_base_spec_controller") +require File.expand_path("#{dir}/resources/helpers/addition_helper") +require File.expand_path("#{dir}/resources/helpers/explicit_helper") +require File.expand_path("#{dir}/resources/helpers/more_explicit_helper") +require File.expand_path("#{dir}/resources/helpers/view_spec_helper") +require File.expand_path("#{dir}/resources/helpers/plugin_application_helper") -ActionController::Routing.controller_paths << "#{dir}/../spec_resources/controllers" +require File.expand_path("#{dir}/resources/models/animal") +require File.expand_path("#{dir}/resources/models/person") +require File.expand_path("#{dir}/resources/models/thing") + +extra_controller_paths = File.expand_path("#{dir}/resources/controllers") + +unless ActionController::Routing.controller_paths.include?(extra_controller_paths) + ActionController::Routing.instance_eval {@possible_controllers = nil} + ActionController::Routing.controller_paths << extra_controller_paths +end module Spec module Rails module Example class ViewExampleGroupController - set_view_path File.join(File.dirname(__FILE__), "..", "spec_resources", "views") + set_view_path File.join(File.dirname(__FILE__), "..", "spec", "resources", "views") end end end @@ -38,6 +49,13 @@ class Proc end end +Spec::Runner.configure do |config| + config.before(:each, :type => :controller) do + end +end + + +ActionController::Routing::Routes.clear! # only since we're drawing routes here ActionController::Routing::Routes.draw do |map| map.resources :rspec_on_rails_specs map.connect 'custom_route', :controller => 'custom_route_spec', :action => 'custom_route' vendor/plugins/rspec-rails/spec/spec_helper.rb @@ -1,3 +1,4 @@ Autotest.add_hook :initialize do |at| at.add_exception("spec/interop/test/unit/resources") + at.add_exception("spec/spec/runner/drb_command_line_spec.rb") end \ No newline at end of file vendor/plugins/rspec/.autotest @@ -1,7 +1,9 @@ pkg doc +coverage tmtags story_server/prototype/rspec_stories.html .DS_Store .emacs-project *~ +email.txt vendor/plugins/rspec/.gitignore @@ -1,35 +1,41 @@ -$:.unshift('lib') +# -*- ruby -*- + +$:.unshift(File.join(File.dirname(__FILE__), 'lib')) require 'rubygems' -require 'rake/gempackagetask' -require 'rake/contrib/rubyforgepublisher' -require 'rake/clean' -require 'rake/rdoctask' -require 'rake/testtask' +require 'hoe' require 'spec/version' -dir = File.dirname(__FILE__) +require 'spec/rake/spectask' +require 'cucumber/rake/task' + +class Hoe + def extra_deps + @extra_deps.reject! { |x| Array(x).first == 'hoe' } + @extra_deps + end +end -# Some of the tasks are in separate files since they are also part of the website documentation -load File.dirname(__FILE__) + '/rake_tasks/examples.rake' -load File.dirname(__FILE__) + '/rake_tasks/examples_with_rcov.rake' -load File.dirname(__FILE__) + '/rake_tasks/failing_examples_with_html.rake' -load File.dirname(__FILE__) + '/rake_tasks/verify_rcov.rake' +Hoe.new('rspec', Spec::VERSION::STRING) do |p| + p.summary = Spec::VERSION::SUMMARY + p.url = 'http://rspec.info/' + p.description = "Behaviour Driven Development for Ruby." + p.rubyforge_name = 'rspec' + p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org') + p.extra_deps = [["cucumber",">= 0.1.13"]] + p.remote_rdoc_dir = "rspec/#{Spec::VERSION::STRING}" +end + +['audit','test','test_deps','default','post_blog'].each do |task| + Rake.application.instance_variable_get('@tasks').delete(task) +end -PKG_NAME = "rspec" -PKG_VERSION = Spec::VERSION::STRING -PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" -PKG_FILES = FileList[ - '[A-Z]*', - 'lib/**/*.rb', - 'spec/**/*', - 'examples/**/*', - 'failing_examples/**/*', - 'plugins/**/*', - 'stories/**/*', - 'rake_tasks/**/*' -] +task :verify_rcov => [:spec, :features] +task :default => :verify_rcov -task :default => [:verify_rcov] -task :verify_rcov => [:spec, :stories] +# # Some of the tasks are in separate files since they are also part of the website documentation +load File.dirname(__FILE__) + '/resources/rake/examples.rake' +load File.dirname(__FILE__) + '/resources/rake/examples_with_rcov.rake' +load File.dirname(__FILE__) + '/resources/rake/failing_examples_with_html.rake' +load File.dirname(__FILE__) + '/resources/rake/verify_rcov.rake' desc "Run all specs" Spec::Rake::SpecTask.new do |t| @@ -37,69 +43,18 @@ Spec::Rake::SpecTask.new do |t| t.spec_opts = ['--options', 'spec/spec.opts'] unless ENV['NO_RCOV'] t.rcov = true - t.rcov_dir = '../doc/output/coverage' - t.rcov_opts = ['--exclude', 'lib/spec.rb,lib/spec/runner.rb,spec\/spec,bin\/spec,examples,\/var\/lib\/gems,\/Library\/Ruby,\.autotest'] + t.rcov_dir = 'coverage' + t.rcov_opts = ['--text-report', '--exclude', "lib/spec.rb,lib/spec/runner.rb,spec\/spec,bin\/spec,examples,\/gems,\/Library\/Ruby,\.autotest,#{ENV['GEM_HOME']}"] end end -desc "Run all stories" -task :stories do - html = 'story_server/prototype/rspec_stories.html' - ruby "stories/all.rb --colour --format plain --format html:#{html}" - unless IO.read(html) =~ /<span class="param">/m - raise 'highlighted parameters are broken in story HTML' - end -end - -desc "Run all specs and store html output in doc/output/report.html" -Spec::Rake::SpecTask.new('spec_html') do |t| - t.spec_files = FileList['spec/**/*_spec.rb'] - t.spec_opts = ['--format html:../../../../doc/output/report.html', '--format progress','--backtrace'] -end +desc "Run Cucumber features" +Cucumber::Rake::Task.new do; end -desc "Run all failing examples" +desc "Run failing examples (see failure output)" Spec::Rake::SpecTask.new('failing_examples') do |t| t.spec_files = FileList['failing_examples/**/*_spec.rb'] -end - -desc 'Generate RDoc' -rd = Rake::RDocTask.new do |rdoc| - rdoc.rdoc_dir = '../doc/output/rdoc' - rdoc.options << '--title' << 'RSpec' << '--line-numbers' << '--inline-source' << '--main' << 'README' - rdoc.rdoc_files.include('README', 'CHANGES', 'MIT-LICENSE', 'lib/**/*.rb') -end - -spec = Gem::Specification.new do |s| - s.name = PKG_NAME - s.version = PKG_VERSION - s.summary = Spec::VERSION::DESCRIPTION - s.description = <<-EOF - RSpec is a behaviour driven development (BDD) framework for Ruby. RSpec was - created in response to Dave Astels' article _A New Look at Test Driven Development_ - which can be read at: http://daveastels.com/index.php?p=5 RSpec is intended to - provide the features discussed in Dave's article. - EOF - - s.files = PKG_FILES.to_a - s.require_path = 'lib' - - s.has_rdoc = true - s.rdoc_options = rd.options - s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$|^EXAMPLES.rd$/ }.to_a - - s.bindir = 'bin' - s.executables = ['spec', 'spec_translator', 'autospec'] - s.default_executable = 'spec' - s.author = "RSpec Development Team" - s.email = "rspec-devel@rubyforge.org" - s.homepage = "http://rspec.rubyforge.org" - s.platform = Gem::Platform::RUBY - s.rubyforge_project = "rspec" -end - -Rake::GemPackageTask.new(spec) do |pkg| - pkg.need_zip = true - pkg.need_tar = true + t.spec_opts = ['--options', 'spec/spec.opts'] end def egrep(pattern) @@ -121,7 +76,8 @@ task :todo do egrep /(FIXME|TODO|TBD)/ end -task :release => [:verify_committed, :verify_user, :spec, :publish_packages, :tag, :publish_news] +desc "verify_committed, verify_rcov, post_news, release" +task :complete_release => [:verify_committed, :verify_rcov, :post_news, :release] desc "Verifies that there is no uncommitted code" task :verify_committed do @@ -130,133 +86,4 @@ task :verify_committed do raise "\n!!! Do a git commit first !!!\n\n" if line =~ /^#\s*modified:/ end end -end - -desc "Creates a tag in svn" -task :tag do - # from = `svn info #{File.dirname(__FILE__)}`.match(/URL: (.*)\/rspec/n)[1] - # to = from.gsub(/trunk/, "tags/#{Spec::VERSION::TAG}") - # current = from.gsub(/trunk/, "tags/CURRENT") - # - # puts "Creating tag in SVN" - # tag_cmd = "svn cp #{from} #{to} -m \"Tag release #{Spec::VERSION::FULL_VERSION}\"" - # `#{tag_cmd}` ; raise "ERROR: #{tag_cmd}" unless $? == 0 - # - # puts "Removing CURRENT" - # remove_current_cmd = "svn rm #{current} -m \"Remove tags/CURRENT\"" - # `#{remove_current_cmd}` ; raise "ERROR: #{remove_current_cmd}" unless $? == 0 - # - # puts "Re-Creating CURRENT" - # create_current_cmd = "svn cp #{to} #{current} -m \"Copy #{Spec::VERSION::TAG} to tags/CURRENT\"" - # `#{create_current_cmd}` ; "ERROR: #{create_current_cmd}" unless $? == 0 -end - -task :verify_user do - raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER'] -end - -desc "Upload Website to RubyForge" -task :publish_website => [:verify_user, :website] do - unless Spec::VERSION::RELEASE_CANDIDATE - publisher = Rake::SshDirPublisher.new( - "rspec-website@rubyforge.org", - "/var/www/gforge-projects/#{PKG_NAME}", - "../doc/output" - ) - publisher.upload - else - puts "** Not publishing packages to RubyForge - this is a prerelease" - end -end - -desc "Upload Website archive to RubyForge" -task :archive_website => [:verify_user, :website] do - publisher = Rake::SshDirPublisher.new( - "rspec-website@rubyforge.org", - "/var/www/gforge-projects/#{PKG_NAME}/#{Spec::VERSION::TAG}", - "../doc/output" - ) - publisher.upload -end - -desc "Package the Rails plugin" -task :package_rspec_on_rails do - mkdir 'pkg' rescue nil - rm_rf "pkg/rspec-rails-#{PKG_VERSION}" rescue nil - `git clone ../rspec-rails pkg/rspec-rails-#{PKG_VERSION}` - rm_rf "pkg/rspec-rails-#{PKG_VERSION}/.git" - Dir.chdir 'pkg' do - `tar cvzf rspec-rails-#{PKG_VERSION}.tgz rspec-rails-#{PKG_VERSION}` - end -end -task :pkg => :package_rspec_on_rails - -desc "Package the RSpec.tmbundle" -task :package_tmbundle do - mkdir 'pkg' rescue nil - rm_rf "pkg/RSpec-#{PKG_VERSION}.tmbundle" rescue nil - `git clone ../../../../RSpec.tmbundle pkg/RSpec-#{PKG_VERSION}.tmbundle` - rm_rf "pkg/RSpec-#{PKG_VERSION}.tmbundle/.git" - Dir.chdir 'pkg' do - `tar cvzf RSpec-#{PKG_VERSION}.tmbundle.tgz RSpec-#{PKG_VERSION}.tmbundle` - end -end -task :pkg => :package_tmbundle - -desc "Publish gem+tgz+zip on RubyForge. You must make sure lib/version.rb is aligned with the CHANGELOG file" -task :publish_packages => [:verify_user, :package, :pkg] do - release_files = FileList[ - "pkg/#{PKG_FILE_NAME}.gem", - "pkg/#{PKG_FILE_NAME}.tgz", - "pkg/rspec-rails-#{PKG_VERSION}.tgz", - "pkg/#{PKG_FILE_NAME}.zip", - "pkg/RSpec-#{PKG_VERSION}.tmbundle.tgz" - ] - unless Spec::VERSION::RELEASE_CANDIDATE - require 'meta_project' - require 'rake/contrib/xforge' - - Rake::XForge::Release.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |xf| - # Never hardcode user name and password in the Rakefile! - xf.user_name = ENV['RUBYFORGE_USER'] - xf.files = release_files.to_a - xf.release_name = "RSpec #{PKG_VERSION}" - end - else - puts "SINCE THIS IS A PRERELEASE, FILES ARE UPLOADED WITH SSH, NOT TO THE RUBYFORGE FILE SECTION" - puts "YOU MUST TYPE THE PASSWORD #{release_files.length} TIMES..." - - host = "rspec-website@rubyforge.org" - remote_dir = "/var/www/gforge-projects/#{PKG_NAME}" - - publisher = Rake::SshFilePublisher.new( - host, - remote_dir, - File.dirname(__FILE__), - *release_files - ) - publisher.upload - - puts "UPLADED THE FOLLOWING FILES:" - release_files.each do |file| - name = file.match(/pkg\/(.*)/)[1] - puts "* http://rspec.rubyforge.org/#{name}" - end - - puts "They are not linked to anywhere, so don't forget to tell people!" - end -end - -desc "Publish news on RubyForge" -task :publish_news => [:verify_user] do - unless Spec::VERSION::RELEASE_CANDIDATE - require 'meta_project' - require 'rake/contrib/xforge' - Rake::XForge::NewsPublisher.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |news| - # Never hardcode user name and password in the Rakefile! - news.user_name = ENV['RUBYFORGE_USER'] - end - else - puts "** Not publishing news to RubyForge - this is a prerelease" - end end \ No newline at end of file vendor/plugins/rspec/Rakefile @@ -1,3 +1,4 @@ #!/usr/bin/env ruby -ENV['RSPEC'] = 'true' -system 'autotest' \ No newline at end of file +ENV['RSPEC'] = 'true' # allows autotest to discover rspec +ENV['AUTOTEST'] = 'true' # allows autotest to run w/ color on linux +system (RUBY_PLATFORM =~ /mswin|mingw/ ? 'autotest.bat' : 'autotest'), *ARGV \ No newline at end of file vendor/plugins/rspec/bin/autospec @@ -1,4 +1,4 @@ #!/usr/bin/env ruby $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib")) require 'spec' -exit ::Spec::Runner::CommandLine.run(rspec_options) +exit ::Spec::Runner::CommandLine.run vendor/plugins/rspec/bin/spec @@ -1,3 +1,3 @@ Autotest.add_discovery do - "rspec" if File.exist?('spec') && ENV['RSPEC'] + "rspec" if File.directory?('spec') && ENV['RSPEC'] end vendor/plugins/rspec/lib/autotest/discover.rb @@ -4,7 +4,7 @@ Autotest.add_hook :initialize do |at| at.clear_mappings # watch out: Ruby bug (1.8.6): # %r(/) != /\// - at.add_mapping(%r%^spec/.*\.rb$%) { |filename, _| + at.add_mapping(%r%^spec/.*_spec.rb$%) { |filename, _| filename } at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m| @@ -21,14 +21,14 @@ class Autotest::Rspec < Autotest def initialize super - self.failed_results_re = /^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m + self.failed_results_re = /^\d+\)\n(?:\e\[\d*m)?(?:.*?in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m self.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m end def consolidate_failures(failed) filters = new_hash_of_arrays failed.each do |spec, trace| - if trace =~ /\n(\.\/)?(.*spec\.rb):[\d]+:\Z?/ + if trace =~ /\n(\.\/)?(.*spec\.rb):[\d]+:/ filters[$2] << spec end end @@ -36,37 +36,12 @@ class Autotest::Rspec < Autotest end def make_test_cmd(files_to_test) - return "#{ruby} -S #{spec_command} #{add_options_if_present} #{files_to_test.keys.flatten.join(' ')}" + return '' if files_to_test.empty? + spec_program = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec')) + return "#{ruby} #{spec_program} #{files_to_test.keys.flatten.join(' ')} #{add_options_if_present}" end def add_options_if_present # :nodoc: File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : "" end - - # Finds the proper spec command to use. Precendence is set in the - # lazily-evaluated method spec_commands. Alias + Override that in - # ~/.autotest to provide a different spec command then the default - # paths provided. - def spec_command(separator=File::ALT_SEPARATOR) - unless defined? @spec_command then - @spec_command = spec_commands.find { |cmd| File.exists? cmd } - - raise RspecCommandError, "No spec command could be found!" unless @spec_command - - @spec_command.gsub! File::SEPARATOR, separator if separator - end - @spec_command - end - - # Autotest will look for spec commands in the following - # locations, in this order: - # - # * bin/spec - # * default spec bin/loader installed in Rubygems - def spec_commands - [ - File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec')), - File.join(Config::CONFIG['bindir'], 'spec') - ] - end end vendor/plugins/rspec/lib/autotest/rspec.rb @@ -1,31 +1,7 @@ -require 'spec/version' require 'spec/matchers' require 'spec/expectations' require 'spec/example' -require 'spec/extensions' require 'spec/runner' -require 'spec/adapters' - -if Object.const_defined?(:Test) - require 'spec/interop/test' -end - -module Spec - class << self - def run? - @run || rspec_options.examples_run? - end - - def run - return true if run? - result = rspec_options.run_examples - @run = true - result - end - attr_writer :run - - def exit? - !Object.const_defined?(:Test) || Test::Unit.run? - end - end -end \ No newline at end of file +require 'spec/version' +require 'spec/dsl' +require 'spec/ruby' vendor/plugins/rspec/lib/spec.rb @@ -1,12 +1,186 @@ +module Spec + # == Example Groups and Code Examples + # + # A Code Example is an executable example of how a bit of code is expected + # to behave. + # + # An Example Group is a group of code examples. + # + # RSpec exposes a DSL to describe groups of examples. + # + # describe Account do + # it "should have a balance of $0" do + # account = Account.new + # account.balance.should == Money.new(0, :dollars) + # end + # end + # + # == Before and After + # + # You can use the <tt>before()</tt> and <tt>after()</tt> methods to extract + # common code within an Example Group. Both methods take an optional scope + # argument so you can run the block before :each example or before :all + # examples + # + # describe "..." do + # before :all do + # ... + # end + # + # before :each do + # ... + # end + # + # it "should do something" do + # ... + # end + # + # it "should do something else" do + # ... + # end + # + # after :each do + # ... + # end + # + # after :all do + # ... + # end + # + # end + # + # The <tt>before :each</tt> block will run before each of the examples, once + # for each example. Likewise, the <tt>after :each</tt> block will run after + # each of the examples. + # + # It is also possible to specify a <tt>before :all</tt> and <tt>after + # :all</tt> block that will run only once for each example group, before the + # first <code>before :each</code> and after the last <code>after + # :each</code> respectively. The use of these is generally discouraged, + # because it introduces dependencies between the examples. Still, it might + # prove useful for very expensive operations if you know what you are doing. + # + # == Local helper methods + # + # You can include local helper methods by simply expressing them within an + # example group: + # + # describe "..." do + # + # it "..." do + # helper_method + # end + # + # def helper_method + # ... + # end + # + # end + # + # == Included helper methods + # + # You can include helper methods in multiple example groups by expressing + # them within a module, and then including that module in your example + # groups: + # + # module AccountExampleHelperMethods + # def helper_method + # ... + # end + # end + # + # describe "A new account" do + # include AccountExampleHelperMethods + # before do + # @account = Account.new + # end + # + # it "should have a balance of $0" do + # helper_method + # @account.balance.should eql(Money.new(0, :dollars)) + # end + # end + # + # == Shared Example Groups + # + # You can define a shared example group, that may be used on other groups + # + # share_examples_for "All Editions" do + # it "all editions behaviour" ... + # end + # + # describe SmallEdition do + # it_should_behave_like "All Editions" + # + # it "should do small edition stuff" do + # ... + # end + # end + # + # You can also assign the shared group to a module and include that + # + # share_as :AllEditions do + # it "should do all editions stuff" ... + # end + # + # describe SmallEdition do + # it_should_behave_like AllEditions + # + # it "should do small edition stuff" do + # ... + # end + # end + # + # And, for those of you who prefer to use something more like Ruby, you can + # just include the module directly + # + # describe SmallEdition do + # include AllEditions + # + # it "should do small edition stuff" do + # ... + # end + # end + module Example + class << self + def args_and_options(*args) # :nodoc: + with_options_from(args) do |options| + return args, options + end + end + + def scope_from(*args) # :nodoc: + args[0] || :each + end + + def scope_and_options(*args) # :nodoc: + args, options = args_and_options(*args) + return scope_from(*args), options + end + + def add_spec_path_to(args) # :nodoc: + args << {} unless Hash === args.last + args.last[:spec_path] ||= caller(0)[2] + end + + private + + def with_options_from(args) + yield Hash === args.last ? args.pop : {} if block_given? + end + end + end +end + require 'timeout' +require 'spec/example/before_and_after_hooks' require 'spec/example/pending' require 'spec/example/module_reopening_fix' -require 'spec/example/module_inclusion_warnings' require 'spec/example/example_group_methods' require 'spec/example/example_methods' require 'spec/example/example_group' require 'spec/example/shared_example_group' require 'spec/example/example_group_factory' require 'spec/example/errors' -require 'spec/example/configuration' require 'spec/example/example_matcher' + vendor/plugins/rspec/lib/spec/example.rb @@ -1,9 +1,30 @@ module Spec module Example class ExamplePendingError < StandardError - end + attr_reader :pending_caller - class PendingExampleFixedError < StandardError + def initialize(message=nil) + super + @pending_caller = caller[2] + end + end + + class NotYetImplementedError < ExamplePendingError + MESSAGE = "Not Yet Implemented" + RSPEC_ROOT_LIB = File.expand_path(File.dirname(__FILE__) + "/../..") + + def initialize(backtrace) + super(MESSAGE) + @pending_caller = pending_caller_from(backtrace) + end + + private + + def pending_caller_from(backtrace) + backtrace.detect {|line| !line.include?(RSPEC_ROOT_LIB) } + end end + + class PendingExampleFixedError < StandardError; end end end vendor/plugins/rspec/lib/spec/example/errors.rb @@ -6,9 +6,18 @@ module Spec extend Spec::Example::ExampleGroupMethods include Spec::Example::ExampleMethods - def initialize(defined_description, &implementation) + def initialize(defined_description, options={}, &implementation) + @_options = options @_defined_description = defined_description - @_implementation = implementation + @_implementation = implementation || pending_implementation + @_backtrace = caller + end + + private + + def pending_implementation + error = NotYetImplementedError.new(caller) + lambda { raise(error) } end end end vendor/plugins/rspec/lib/spec/example/example_group.rb @@ -1,12 +1,21 @@ module Spec module Example class ExampleGroupFactory - class << self + module ClassMethods def reset @example_group_types = nil default(ExampleGroup) end + def registered_or_ancestor_of_registered?(example_group_classes) # :nodoc: + example_group_classes.each do |example_group_class| + return false unless registered_types.any? do |registered_type| + registered_type.ancestors.include? example_group_class + end + end + return true + end + # Registers an example group class +klass+ with the symbol +type+. For # example: # @@ -41,12 +50,32 @@ module Spec end def create_example_group(*args, &block) - opts = Hash === args.last ? args.last : {} - superclass = determine_superclass(opts) + raise ArgumentError if args.empty? + raise ArgumentError unless block + Spec::Example::add_spec_path_to(args) + block = include_scope(args.last[:scope], &block) + superclass = determine_superclass(args.last) superclass.describe(*args, &block) end + + def create_shared_example_group(*args, &block) + Spec::Example::add_spec_path_to(args) + SharedExampleGroup.register(*args, &block) + end + + def include_scope(context, &block) + if (Spec::Ruby.version.to_f == 1.9) && Module === context + lambda {include context;instance_eval(&block)} + else + block + end + end + + def assign_scope(scope, args) + args.last[:scope] = scope + end - protected + protected def determine_superclass(opts) key = if opts[:type] @@ -56,8 +85,15 @@ module Spec end get(key) end + + private + + def registered_types + @example_group_types.values + end end + extend ClassMethods self.reset end end vendor/plugins/rspec/lib/spec/example/example_group_factory.rb @@ -6,19 +6,49 @@ module Spec attr_accessor :matcher_class def description_text(*args) - args.inject("") do |result, arg| - result << " " unless (result == "" || arg.to_s =~ /^(\s|\.|#)/) - result << arg.to_s + args.inject("") do |description, arg| + description << " " unless (description == "" || arg.to_s =~ /^(\s|\.|#)/) + description << arg.to_s end end + + def example_group_creation_listeners + @example_group_creation_listeners ||= [] + end end - attr_reader :description_text, :description_args, :description_options, :spec_path, :registration_binding_block + include Spec::Example::BeforeAndAfterHooks + + attr_reader :description_options, :spec_path + alias :options :description_options + + # Provides the backtrace up to where this example_group was declared. + def backtrace + @backtrace + end + + # Deprecated - use +backtrace()+ + def example_group_backtrace + Kernel.warn <<-WARNING +ExampleGroupMethods#example_group_backtrace is deprecated and will be removed +from a future version. Please use ExampleGroupMethods#backtrace instead. +WARNING + backtrace + end + + def description_args + @description_args ||= [] + end def inherited(klass) super - klass.register {} - Spec::Runner.register_at_exit_hook + register_example_group(klass) + end + + def register_example_group(klass) + ExampleGroupMethods.example_group_creation_listeners.each do |l| + l.register_example_group(klass) + end end # Makes the describe/it syntax available from a class. For example: @@ -36,41 +66,54 @@ module Spec # end # def describe(*args, &example_group_block) - args << {} unless Hash === args.last if example_group_block - params = args.last - params[:spec_path] = eval("caller(0)[1]", example_group_block) unless params[:spec_path] - if params[:shared] - SharedExampleGroup.new(*args, &example_group_block) + Spec::Example::add_spec_path_to(args) + options = args.last + if options[:shared] + create_shared_example_group(*args, &example_group_block) else - self.subclass("Subclass") do - describe(*args) - module_eval(&example_group_block) - end + create_subclass(*args, &example_group_block) end else set_description(*args) - before_eval - self end end alias :context :describe - + + def create_shared_example_group(*args, &example_group_block) # :nodoc: + SharedExampleGroup.register(*args, &example_group_block) + end + + def create_subclass(*args, &example_group_block) # :nodoc: + subclass("Subclass") do + set_description(*args) + module_eval(&example_group_block) + end + end + + # Creates a new subclass of self, with a name "under" our own name. + # Example: + # + # x = Foo::Bar.subclass('Zap'){} + # x.name # => Foo::Bar::Zap_1 + # x.superclass.name # => Foo::Bar + def subclass(base_name, &body) # :nodoc: + @class_count ||= 0 + @class_count += 1 + klass = Class.new(self) + class_name = "#{base_name}_#{@class_count}" + const_set(class_name, klass) + klass.instance_eval(&body) + klass + end + # Use this to pull in examples from shared example groups. - # See Spec::Runner for information about shared example groups. - def it_should_behave_like(shared_example_group) - case shared_example_group - when SharedExampleGroup - include shared_example_group - else - example_group = SharedExampleGroup.find_shared_example_group(shared_example_group) - unless example_group - raise RuntimeError.new("Shared Example Group '#{shared_example_group}' can not be found") - end - include(example_group) + def it_should_behave_like(*shared_example_groups) + shared_example_groups.each do |group| + include_shared_example_group(group) end end - + # :call-seq: # predicate_matchers[matcher_name] = method_on_object # predicate_matchers[matcher_name] = [method1_on_object, method2_on_object] @@ -79,7 +122,7 @@ module Spec # a predicate on your class. RSpec provides a couple of these # out of the box: # - # exist (or state expectations) + # exist (for state expectations) # File.should exist("path/to/file") # # an_instance_of (for mock argument constraints) @@ -103,145 +146,96 @@ module Spec @predicate_matchers ||= {:an_instance_of => :is_a?} end - # Creates an instance of Spec::Example::Example and adds - # it to a collection of examples of the current example group. - def it(description=nil, &implementation) - e = new(description, &implementation) + # Creates an instance of the current example group class and adds it to + # a collection of examples of the current example group. + def example(description=nil, options={}, &implementation) + e = new(description, options, &implementation) example_objects << e e end - alias_method :specify, :it + alias_method :it, :example + alias_method :specify, :example # Use this to temporarily disable an example. - def xit(description=nil, opts={}, &block) + def xexample(description=nil, opts={}, &block) Kernel.warn("Example disabled: #{description}") end - alias_method :xspecify, :xit + + alias_method :xit, :xexample + alias_method :xspecify, :xexample - def run - examples = examples_to_run - reporter.add_example_group(self) unless examples_to_run.empty? + def run(run_options) + examples = examples_to_run(run_options) + run_options.reporter.add_example_group(self) unless examples.empty? return true if examples.empty? - return dry_run(examples) if dry_run? + return dry_run(examples, run_options) if run_options.dry_run? - plugin_mock_framework - define_methods_from_predicate_matchers + plugin_mock_framework(run_options) + define_methods_from_predicate_matchers(run_options) - success, before_all_instance_variables = run_before_all - success, after_all_instance_variables = execute_examples(success, before_all_instance_variables, examples) - success = run_after_all(success, after_all_instance_variables) + success, before_all_instance_variables = run_before_all(run_options) + success, after_all_instance_variables = execute_examples(success, before_all_instance_variables, examples, run_options) + success = run_after_all(success, after_all_instance_variables, run_options) end def description result = ExampleGroupMethods.description_text(*description_parts) - if result.nil? || result == "" - return to_s - else - result - end + (result.nil? || result == "") ? to_s : result end - + def described_type - description_parts.find {|part| part.is_a?(Module)} + description_parts.reverse.find {|part| part.is_a?(Module)} end - + + # Defines an explicit subject for an example group which can then be the + # implicit receiver (through delegation) of calls to +should+. + # + # == Examples + # + # describe CheckingAccount, "with $50" do + # subject { CheckingAccount.new(:amount => 50, :currency => :USD) } + # it { should have_a_balance_of(50, :USD)} + # it { should_not be_overdrawn} + # end + # + # See +ExampleMethods#should+ for more information about this approach. + def subject(&block) + @_subject_block = block + end + + def subject_block + @_subject_block || lambda {nil} + end + def description_parts #:nodoc: parts = [] - execute_in_class_hierarchy do |example_group| - parts << example_group.description_args + each_ancestor_example_group_class do |example_group_class| + parts << example_group_class.description_args end parts.flatten.compact end def set_description(*args) - args, options = args_and_options(*args) + args, options = Spec::Example.args_and_options(*args) @description_args = args @description_options = options @description_text = ExampleGroupMethods.description_text(*args) + @backtrace = caller(1) @spec_path = File.expand_path(options[:spec_path]) if options[:spec_path] - if described_type.class == Module - @described_module = described_type - end self end - attr_reader :described_module - - def examples #:nodoc: + def examples(run_options=nil) #:nodoc: examples = example_objects.dup add_method_examples(examples) - rspec_options.reverse ? examples.reverse : examples + (run_options && run_options.reverse) ? examples.reverse : examples end def number_of_examples #:nodoc: examples.length end - # Registers a block to be executed before each example. - # This method prepends +block+ to existing before blocks. - def prepend_before(*args, &block) - scope, options = scope_and_options(*args) - parts = before_parts_from_scope(scope) - parts.unshift(block) - end - - # Registers a block to be executed before each example. - # This method appends +block+ to existing before blocks. - def append_before(*args, &block) - scope, options = scope_and_options(*args) - parts = before_parts_from_scope(scope) - parts << block - end - alias_method :before, :append_before - - # Registers a block to be executed after each example. - # This method prepends +block+ to existing after blocks. - def prepend_after(*args, &block) - scope, options = scope_and_options(*args) - parts = after_parts_from_scope(scope) - parts.unshift(block) - end - alias_method :after, :prepend_after - - # Registers a block to be executed after each example. - # This method appends +block+ to existing after blocks. - def append_after(*args, &block) - scope, options = scope_and_options(*args) - parts = after_parts_from_scope(scope) - parts << block - end - - def remove_after(scope, &block) - after_each_parts.delete(block) - end - - # Deprecated. Use before(:each) - def setup(&block) - before(:each, &block) - end - - # Deprecated. Use after(:each) - def teardown(&block) - after(:each, &block) - end - - def before_all_parts # :nodoc: - @before_all_parts ||= [] - end - - def after_all_parts # :nodoc: - @after_all_parts ||= [] - end - - def before_each_parts # :nodoc: - @before_each_parts ||= [] - end - - def after_each_parts # :nodoc: - @after_each_parts ||= [] - end - # Only used from RSpec's own examples def reset # :nodoc: @before_all_parts = nil @@ -250,137 +244,110 @@ module Spec @after_each_parts = nil end - def register(&registration_binding_block) - @registration_binding_block = registration_binding_block - rspec_options.add_example_group self - end - - def unregister #:nodoc: - rspec_options.remove_example_group self - end - - def registration_backtrace - eval("caller", registration_binding_block) - end - def run_before_each(example) - execute_in_class_hierarchy do |example_group| - example.eval_each_fail_fast(example_group.before_each_parts) + each_ancestor_example_group_class do |example_group_class| + example.eval_each_fail_fast(example_group_class.before_each_parts) end end def run_after_each(example) - execute_in_class_hierarchy(:superclass_first) do |example_group| - example.eval_each_fail_slow(example_group.after_each_parts) + each_ancestor_example_group_class(:superclass_first) do |example_group_class| + example.eval_each_fail_slow(example_group_class.after_each_parts) end end private - def dry_run(examples) + def dry_run(examples, run_options) examples.each do |example| - rspec_options.reporter.example_started(example) - rspec_options.reporter.example_finished(example) + run_options.reporter.example_started(example) + run_options.reporter.example_finished(example) end - return true end - def run_before_all + def run_before_all(run_options) before_all = new("before(:all)") begin - execute_in_class_hierarchy do |example_group| - before_all.eval_each_fail_fast(example_group.before_all_parts) + each_ancestor_example_group_class do |example_group_class| + before_all.eval_each_fail_fast(example_group_class.before_all_parts) end return [true, before_all.instance_variable_hash] rescue Exception => e - reporter.failure(before_all, e) + run_options.reporter.failure(before_all, e) return [false, before_all.instance_variable_hash] end end - def execute_examples(success, instance_variables, examples) + def execute_examples(success, instance_variables, examples, run_options) return [success, instance_variables] unless success after_all_instance_variables = instance_variables examples.each do |example_group_instance| - success &= example_group_instance.execute(rspec_options, instance_variables) + success &= example_group_instance.execute(run_options, instance_variables) after_all_instance_variables = example_group_instance.instance_variable_hash end return [success, after_all_instance_variables] end - def run_after_all(success, instance_variables) + def run_after_all(success, instance_variables, run_options) after_all = new("after(:all)") after_all.set_instance_variables_from_hash(instance_variables) - execute_in_class_hierarchy(:superclass_first) do |example_group| - after_all.eval_each_fail_slow(example_group.after_all_parts) + each_ancestor_example_group_class(:superclass_first) do |example_group_class| + after_all.eval_each_fail_slow(example_group_class.after_all_parts) end return success rescue Exception => e - reporter.failure(after_all, e) + run_options.reporter.failure(after_all, e) return false end - def examples_to_run - all_examples = examples - return all_examples unless specified_examples? + def examples_to_run(run_options) + all_examples = examples(run_options) + return all_examples unless specified_examples?(run_options) all_examples.reject do |example| matcher = ExampleGroupMethods.matcher_class. new(description.to_s, example.description) - !matcher.matches?(specified_examples) + !matcher.matches?(run_options.examples) end end - def specified_examples? - specified_examples && !specified_examples.empty? - end - - def specified_examples - rspec_options.examples - end - - def reporter - rspec_options.reporter - end - - def dry_run? - rspec_options.dry_run + def specified_examples?(run_options) + run_options.examples && !run_options.examples.empty? end def example_objects @example_objects ||= [] end - def execute_in_class_hierarchy(superclass_last=false) + def each_ancestor_example_group_class(superclass_last=false) classes = [] current_class = self - while is_example_group?(current_class) + while is_example_group_class?(current_class) superclass_last ? classes << current_class : classes.unshift(current_class) current_class = current_class.superclass end - superclass_last ? classes << ExampleMethods : classes.unshift(ExampleMethods) - + classes.each do |example_group| yield example_group end end - def is_example_group?(klass) - Module === klass && klass.kind_of?(ExampleGroupMethods) + def is_example_group_class?(klass) + klass.kind_of?(ExampleGroupMethods) && klass.included_modules.include?(ExampleMethods) end - def plugin_mock_framework - case mock_framework = Spec::Runner.configuration.mock_framework + def plugin_mock_framework(run_options) + case mock_framework = run_options.mock_framework when Module include mock_framework else - require Spec::Runner.configuration.mock_framework - include Spec::Plugins::MockFramework + require mock_framework + include Spec::Adapters::MockFramework end end - def define_methods_from_predicate_matchers # :nodoc: + def define_methods_from_predicate_matchers(run_options) # :nodoc: all_predicate_matchers = predicate_matchers.merge( - Spec::Runner.configuration.predicate_matchers + run_options.predicate_matchers ) all_predicate_matchers.each_pair do |matcher_method, method_on_object| define_method matcher_method do |*args| @@ -389,30 +356,6 @@ module Spec end end - def scope_and_options(*args) - args, options = args_and_options(*args) - scope = (args[0] || :each), options - end - - def before_parts_from_scope(scope) - case scope - when :each; before_each_parts - when :all; before_all_parts - when :suite; rspec_options.before_suite_parts - end - end - - def after_parts_from_scope(scope) - case scope - when :each; after_each_parts - when :all; after_all_parts - when :suite; rspec_options.after_suite_parts - end - end - - def before_eval - end - def add_method_examples(examples) instance_methods.sort.each do |method_name| if example_method?(method_name) @@ -430,10 +373,23 @@ module Spec def should_method?(method_name) !(method_name =~ /^should(_not)?$/) && method_name =~ /^should/ && ( - instance_method(method_name).arity == 0 || - instance_method(method_name).arity == -1 + [-1,0].include?(instance_method(method_name).arity) ) end + + def include_shared_example_group(shared_example_group) + case shared_example_group + when SharedExampleGroup + include shared_example_group + else + example_group = SharedExampleGroup.find(shared_example_group) + unless example_group + raise RuntimeError.new("Shared Example Group '#{shared_example_group}' can not be found") + end + include(example_group) + end + end + end end vendor/plugins/rspec/lib/spec/example/example_group_methods.rb @@ -1,14 +1,45 @@ module Spec module Example module ExampleMethods - extend ExampleGroupMethods + extend ModuleReopeningFix - include ModuleInclusionWarnings + def subject # :nodoc: this is somewhat experimental + @subject ||= ( instance_variable_get(subject_variable_name) || + instance_eval(&self.class.subject_block) || + (described_class ? described_class.new : nil) ) + end + + # When +should+ is called with no explicit receiver, the call is + # delegated to the *subject* of the example group. This could be either + # an explicit subject generated by calling the block passed to + # +ExampleGroupMethods#subject+, or, if the group is describing a class, + # an implicitly generated instance of that class. + def should(matcher=nil) + if matcher + subject.should(matcher) + else + subject.should + end + end + + # Just like +should+, +should_not+ delegates to the subject (implicit or + # explicit) of the example group. + def should_not(matcher) + subject.should_not(matcher) + end + + def violated(message="") + raise Spec::Expectations::ExpectationNotMetError.new(message) + end - PENDING_EXAMPLE_BLOCK = lambda { - raise Spec::Example::ExamplePendingError.new("Not Yet Implemented") - } + def description + @_defined_description || ::Spec::Matchers.generated_description || "NO NAME" + end + + def options + @_options + end def execute(options, instance_variables) options.reporter.example_started(self) @@ -17,13 +48,13 @@ module Spec execution_error = nil Timeout.timeout(options.timeout) do begin - before_example - run_with_description_capturing + before_each_example + eval_block rescue Exception => e execution_error ||= e end begin - after_example + after_each_example rescue Exception => e execution_error ||= e end @@ -33,28 +64,24 @@ module Spec success = execution_error.nil? || ExamplePendingError === execution_error end - def instance_variable_hash + def instance_variable_hash # :nodoc: instance_variables.inject({}) do |variable_hash, variable_name| variable_hash[variable_name] = instance_variable_get(variable_name) variable_hash end end - def violated(message="") - raise Spec::Expectations::ExpectationNotMetError.new(message) - end - - def eval_each_fail_fast(procs) #:nodoc: - procs.each do |proc| - instance_eval(&proc) + def eval_each_fail_fast(examples) # :nodoc: + examples.each do |example| + instance_eval(&example) end end - def eval_each_fail_slow(procs) #:nodoc: + def eval_each_fail_slow(examples) # :nodoc: first_exception = nil - procs.each do |proc| + examples.each do |example| begin - instance_eval(&proc) + instance_eval(&example) rescue Exception => e first_exception ||= e end @@ -62,15 +89,19 @@ module Spec raise first_exception if first_exception end - def description - @_defined_description || @_matcher_description || "NO NAME" - end - - def __full_description + # Concats the class description with the example description. + # + # describe Account do + # it "should start with a balance of 0" do + # ... + # + # full_description + # => "Account should start with a balance of 0" + def full_description "#{self.class.description} #{self.description}" end - def set_instance_variables_from_hash(ivars) + def set_instance_variables_from_hash(ivars) # :nodoc: ivars.each do |variable_name, value| # Ruby 1.9 requires variable.to_s on the next line unless ['@_implementation', '@_defined_description', '@_matcher_description', '@method_name'].include?(variable_name.to_s) @@ -79,34 +110,59 @@ module Spec end end - def run_with_description_capturing - begin - return instance_eval(&(@_implementation || PENDING_EXAMPLE_BLOCK)) - ensure - @_matcher_description = Spec::Matchers.generated_description - Spec::Matchers.clear_generated_description - end + def eval_block # :nodoc: + instance_eval(&@_implementation) end - def implementation_backtrace - eval("caller", @_implementation) + # Provides the backtrace up to where this example was declared. + def backtrace + @_backtrace end - protected + # Deprecated - use +backtrace()+ + def implementation_backtrace + Kernel.warn <<-WARNING +ExampleMethods#implementation_backtrace is deprecated and will be removed +from a future version. Please use ExampleMethods#backtrace instead. +WARNING + backtrace + end + + private include Matchers include Pending - def before_example + def before_each_example setup_mocks_for_rspec self.class.run_before_each(self) end - def after_example + def after_each_example self.class.run_after_each(self) verify_mocks_for_rspec ensure teardown_mocks_for_rspec end + + def subject_variable_name + '@' << (described_class ? underscore(described_class.name) : '__this_does_not_exist') + end + + def described_class + Class === described_type ? described_type : nil + end + + def described_type + self.class.described_type + end + + def underscore(camel_cased_word) + camel_cased_word.to_s.gsub(/::/, '_'). + gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2'). + gsub(/([a-z\d])([A-Z])/,'\1_\2'). + tr("-", "_"). + downcase + end end end -end \ No newline at end of file +end vendor/plugins/rspec/lib/spec/example/example_methods.rb @@ -1,57 +1,62 @@ module Spec module Example class SharedExampleGroup < Module - class << self - def add_shared_example_group(new_example_group) - guard_against_redefining_existing_example_group(new_example_group) - shared_example_groups << new_example_group + module ClassMethods + def register(*args, &block) + new_example_group = new(*args, &block) + shared_example_groups << new_example_group unless already_registered?(new_example_group) + new_example_group + end + + def find(example_group_description) + shared_example_groups.find {|b| b.description == example_group_description} end - def find_shared_example_group(example_group_description) - shared_example_groups.find do |b| - b.description == example_group_description - end + def clear + shared_example_groups.clear + end + + def include?(group) + shared_example_groups.include?(group) + end + + def count + shared_example_groups.length end + private + def shared_example_groups - # TODO - this needs to be global, or at least accessible from - # from subclasses of Example in a centralized place. I'm not loving - # this as a solution, but it works for now. - $shared_example_groups ||= [] + @shared_example_groups ||= [] end - - private - def guard_against_redefining_existing_example_group(new_example_group) - existing_example_group = find_shared_example_group(new_example_group.description) - return unless existing_example_group - return if new_example_group.equal?(existing_example_group) - return if spec_path(new_example_group) == spec_path(existing_example_group) + + def already_registered?(new_example_group) + existing_example_group = find(new_example_group.description) + return false unless existing_example_group + return true if new_example_group.equal?(existing_example_group) + return true if expanded_path(new_example_group) == expanded_path(existing_example_group) raise ArgumentError.new("Shared Example '#{existing_example_group.description}' already exists") end - def spec_path(example_group) + def expanded_path(example_group) File.expand_path(example_group.spec_path) end end + + extend ClassMethods include ExampleGroupMethods - public :include def initialize(*args, &example_group_block) - describe(*args) + set_description(*args) @example_group_block = example_group_block - self.class.add_shared_example_group(self) end def included(mod) # :nodoc: mod.module_eval(&@example_group_block) end - def execute_in_class_hierarchy(superclass_last=false) - classes = [self] - superclass_last ? classes << ExampleMethods : classes.unshift(ExampleMethods) - classes.each do |example_group| - yield example_group - end + def each_ancestor_example_group_class(superclass_last=false) + yield self end end end vendor/plugins/rspec/lib/spec/example/shared_example_group.rb @@ -30,27 +30,31 @@ module Spec # RSpec ships with a standard set of useful matchers, and writing your own # matchers is quite simple. See Spec::Matchers for details. module Expectations - class << self - attr_accessor :differ + def self.differ + @differ + end + + def self.differ=(differ) + @differ = differ + end - # raises a Spec::Expectations::ExpectationNotMetError with message - # - # When a differ has been assigned and fail_with is passed - # <code>expected</code> and <code>target</code>, passes them - # to the differ to append a diff message to the failure message. - def fail_with(message, expected=nil, target=nil) # :nodoc: - if Array === message && message.length == 3 - message, expected, target = message[0], message[1], message[2] - end - unless (differ.nil? || expected.nil? || target.nil?) - if expected.is_a?(String) - message << "\nDiff:" << self.differ.diff_as_string(target.to_s, expected) - elsif !target.is_a?(Proc) - message << "\nDiff:" << self.differ.diff_as_object(target, expected) - end + # raises a Spec::Expectations::ExpectationNotMetError with message + # + # When a differ has been assigned and fail_with is passed + # <code>expected</code> and <code>target</code>, passes them + # to the differ to append a diff message to the failure message. + def self.fail_with(message, expected=nil, target=nil) # :nodoc: + if Array === message && message.length == 3 + message, expected, target = message[0], message[1], message[2] + end + unless (differ.nil? || expected.nil? || target.nil?) + if expected.is_a?(String) + message << "\nDiff:" << self.differ.diff_as_string(target.to_s, expected) + elsif !target.is_a?(Proc) + message << "\nDiff:" << self.differ.diff_as_object(target, expected) end - Kernel::raise(Spec::Expectations::ExpectationNotMetError.new(message)) end + Kernel::raise(Spec::Expectations::ExpectationNotMetError.new(message)) end end end vendor/plugins/rspec/lib/spec/expectations.rb @@ -27,7 +27,7 @@ module Spec # # NOTE that this does NOT support receiver.should != expected. # Instead, use receiver.should_not == expected - def should(matcher=:use_operator_matcher, &block) + def should(matcher=nil, &block) ExpectationMatcherHandler.handle_matcher(self, matcher, &block) end @@ -50,7 +50,7 @@ module Spec # => Passes unless (receiver =~ regexp) # # See Spec::Matchers for more information about matchers - def should_not(matcher=:use_operator_matcher, &block) + def should_not(matcher=nil, &block) NegativeExpectationMatcherHandler.handle_matcher(self, matcher, &block) end vendor/plugins/rspec/lib/spec/expectations/extensions/object.rb @@ -2,61 +2,46 @@ module Spec module Expectations class InvalidMatcherError < ArgumentError; end - module MatcherHandlerHelper - def describe_matcher(matcher) - matcher.respond_to?(:description) ? matcher.description : "[#{matcher.class.name} does not provide a description]" - end - end - class ExpectationMatcherHandler - class << self - include MatcherHandlerHelper - def handle_matcher(actual, matcher, &block) - if :use_operator_matcher == matcher - return Spec::Matchers::PositiveOperatorMatcher.new(actual) - end + def self.handle_matcher(actual, matcher, &block) + ::Spec::Matchers.last_should = "should" + return Spec::Matchers::PositiveOperatorMatcher.new(actual) if matcher.nil? - unless matcher.respond_to?(:matches?) - raise InvalidMatcherError, "Expected a matcher, got #{matcher.inspect}." - end - - match = matcher.matches?(actual, &block) - ::Spec::Matchers.generated_description = "should #{describe_matcher(matcher)}" - Spec::Expectations.fail_with(matcher.failure_message) unless match - match + unless matcher.respond_to?(:matches?) + raise InvalidMatcherError, "Expected a matcher, got #{matcher.inspect}." end + + match = matcher.matches?(actual, &block) + ::Spec::Matchers.last_matcher = matcher + Spec::Expectations.fail_with(matcher.failure_message) unless match + match end end class NegativeExpectationMatcherHandler - class << self - include MatcherHandlerHelper - def handle_matcher(actual, matcher, &block) - if :use_operator_matcher == matcher - return Spec::Matchers::NegativeOperatorMatcher.new(actual) - end - - unless matcher.respond_to?(:matches?) - raise InvalidMatcherError, "Expected a matcher, got #{matcher.inspect}." - end + def self.handle_matcher(actual, matcher, &block) + ::Spec::Matchers.last_should = "should not" + return Spec::Matchers::NegativeOperatorMatcher.new(actual) if matcher.nil? + + unless matcher.respond_to?(:matches?) + raise InvalidMatcherError, "Expected a matcher, got #{matcher.inspect}." + end - unless matcher.respond_to?(:negative_failure_message) - Spec::Expectations.fail_with( + unless matcher.respond_to?(:negative_failure_message) + Spec::Expectations.fail_with( <<-EOF Matcher does not support should_not. See Spec::Matchers for more information about matchers. EOF ) - end - match = matcher.matches?(actual, &block) - ::Spec::Matchers.generated_description = "should not #{describe_matcher(matcher)}" - Spec::Expectations.fail_with(matcher.negative_failure_message) if match - match end + match = matcher.matches?(actual, &block) + ::Spec::Matchers.last_matcher = matcher + Spec::Expectations.fail_with(matcher.negative_failure_message) if match + match end end - end end vendor/plugins/rspec/lib/spec/expectations/handler.rb @@ -23,39 +23,51 @@ module Test extend Spec::Example::ExampleGroupMethods include Spec::Example::ExampleMethods - before(:each) {setup} - after(:each) {teardown} + def self.suite + Test::Unit::TestSuiteAdapter.new(self) + end - class << self - def suite - Test::Unit::TestSuiteAdapter.new(self) - end - - def example_method?(method_name) - should_method?(method_name) || test_method?(method_name) - end - - def test_method?(method_name) - method_name =~ /^test[_A-Z]./ && ( - instance_method(method_name).arity == 0 || - instance_method(method_name).arity == -1 - ) - end + def self.example_method?(method_name) + should_method?(method_name) || test_method?(method_name) end - def initialize(defined_description, &implementation) + def self.test_method?(method_name) + method_name =~ /^test[_A-Z]./ && ( + instance_method(method_name).arity == 0 || + instance_method(method_name).arity == -1 + ) + end + + before(:each) {setup} + after(:each) {teardown} + + def initialize(defined_description, options={}, &implementation) @_defined_description = defined_description - @_implementation = implementation + + # TODO - examples fail in rspec-rails if we remove "|| pending_implementation" + # - find a way to fail without it in rspec's code examples + @_implementation = implementation || pending_implementation @_result = ::Test::Unit::TestResult.new - # @method_name is important to set here because it "complies" with Test::Unit's interface. + # @method_name is important to set here because it complies with Test::Unit's interface. # Some Test::Unit extensions depend on @method_name being present. @method_name = @_defined_description + + # TODO - this is necessary to run single examples in rspec-rails, but I haven't + # found a good way to write a failing example just within rspec core + @_backtrace = caller end def run(ignore_this_argument=nil) super() end + + private + + def pending_implementation + error = Spec::Example::NotYetImplementedError.new(caller) + lambda { raise(error) } + end end end end vendor/plugins/rspec/lib/spec/interop/test/unit/testcase.rb @@ -1,6 +1,6 @@ class Test::Unit::TestResult alias_method :tu_passed?, :passed? def passed? - return tu_passed? & ::Spec.run + return tu_passed? & ::Spec::Runner.run end end \ No newline at end of file vendor/plugins/rspec/lib/spec/interop/test/unit/testresult.rb @@ -14,7 +14,7 @@ module Test def run(*args) return true unless args.empty? - example_group.run + example_group.run(Spec::Runner.options) end def size vendor/plugins/rspec/lib/spec/interop/test/unit/testsuite_adapter.rb @@ -1,7 +1,12 @@ +require 'spec/matchers/operator_matcher' +require 'spec/matchers/generated_descriptions' +require 'spec/matchers/errors' +require 'spec/matchers/method_missing' require 'spec/matchers/simple_matcher' require 'spec/matchers/be' require 'spec/matchers/be_close' require 'spec/matchers/change' +require 'spec/matchers/match_array' require 'spec/matchers/eql' require 'spec/matchers/equal' require 'spec/matchers/exist' @@ -13,7 +18,7 @@ require 'spec/matchers/raise_error' require 'spec/matchers/respond_to' require 'spec/matchers/satisfy' require 'spec/matchers/throw_symbol' -require 'spec/matchers/operator_matcher' +require 'spec/matchers/wrap_expectation' module Spec @@ -132,25 +137,5 @@ module Spec # config.include(CustomGameMatchers) # end # - module Matchers - module ModuleMethods - attr_accessor :generated_description - - def clear_generated_description - self.generated_description = nil - end - end - - extend ModuleMethods - - def method_missing(sym, *args, &block) # :nodoc: - return Matchers::Be.new(sym, *args) if sym.starts_with?("be_") - return Matchers::Has.new(sym, *args) if sym.starts_with?("have_") - super - end - - class MatcherError < StandardError - end - - end + module Matchers; end end vendor/plugins/rspec/lib/spec/matchers.rb @@ -3,140 +3,115 @@ module Spec class Be #:nodoc: def initialize(*args) - if args.empty? - @expected = :satisfy_if - else - @expected = parse_expected(args.shift) - end + @expected = args.empty? ? true : set_expected(args.shift) @args = args - @comparison = "" end def matches?(actual) @actual = actual - if handling_predicate? - begin - return @result = actual.__send__(predicate, *@args) - rescue => predicate_error - # This clause should be empty, but rcov will not report it as covered - # unless something (anything) is executed within the clause - rcov_error_report = "http://eigenclass.org/hiki.rb?rcov-0.8.0" - end + handling_predicate? ? run_predicate_on(actual) : match_or_compare(actual) + end + + def run_predicate_on(actual) + begin + return @result = actual.__send__(predicate, *@args) + rescue NameError => predicate_missing_error + "this needs to be here or rcov will not count this branch even though it's executed in a code example" + end - # This supports should_exist > target.exists? in the old world. - # We should consider deprecating that ability as in the new world - # you can't write "should exist" unless you have your own custom matcher. - begin - return @result = actual.__send__(present_tense_predicate, *@args) - rescue - raise predicate_error - end - else - return match_or_compare + begin + return @result = actual.__send__(present_tense_predicate, *@args) + rescue NameError + raise predicate_missing_error end end def failure_message - return "expected #{@comparison}#{expected}, got #{@actual.inspect}" unless handling_predicate? - return "expected #{predicate}#{args_to_s} to return true, got #{@result.inspect}" + handling_predicate? ? + "expected #{predicate}#{args_to_s} to return true, got #{@result.inspect}" : + "expected #{@comparison_method} #{expected}, got #{@actual.inspect}".gsub(' ',' ') end def negative_failure_message - return "expected not #{expected}, got #{@actual.inspect}" unless handling_predicate? - return "expected #{predicate}#{args_to_s} to return false, got #{@result.inspect}" - end - - def expected - return "if to be satisfied" if @expected == :satisfy_if - return true if @expected == :true - return false if @expected == :false - return "nil" if @expected == :nil - return @expected.inspect - end - - def match_or_compare - return @actual ? true : false if @expected == :satisfy_if - return @actual == true if @expected == :true - return @actual == false if @expected == :false - return @actual.nil? if @expected == :nil - return @actual < @expected if @less_than - return @actual <= @expected if @less_than_or_equal - return @actual >= @expected if @greater_than_or_equal - return @actual > @expected if @greater_than - return @actual == @expected if @double_equal - return @actual === @expected if @triple_equal - return @actual.equal?(@expected) + if handling_predicate? + "expected #{predicate}#{args_to_s} to return false, got #{@result.inspect}" + else + message = <<-MESSAGE +'should_not be #{@comparison_method} #{expected}' not only FAILED, +it reads really poorly. + MESSAGE + + raise message << ([:===,:==].include?(@comparison_method) ? + "Why don't you try expressing it without the \"be\"?" : + "Why don't you try expressing it in the positive?") + end end - def ==(expected) - @prefix = "be " - @double_equal = true - @comparison = "== " - @expected = expected - self - end - - def ===(expected) - @prefix = "be " - @triple_equal = true - @comparison = "=== " - @expected = expected - self - end - - def <(expected) - @prefix = "be " - @less_than = true - @comparison = "< " - @expected = expected - self - end - - def <=(expected) - @prefix = "be " - @less_than_or_equal = true - @comparison = "<= " - @expected = expected - self + def description + "#{prefix_to_sentence}#{comparison} #{expected_to_sentence}#{args_to_sentence}".gsub(/\s+/,' ') end - def >=(expected) - @prefix = "be " - @greater_than_or_equal = true - @comparison = ">= " - @expected = expected - self + [:==, :<, :<=, :>=, :>, :===].each do |method| + define_method method do |expected| + compare_to(expected, :using => method) + self + end end - def >(expected) - @prefix = "be " - @greater_than = true - @comparison = "> " - @expected = expected - self - end + private + def match_or_compare(actual) + case @expected + when TrueClass + @actual + else + @actual.__send__(comparison_method, @expected) + end + end - def description - "#{prefix_to_sentence}#{comparison}#{expected_to_sentence}#{args_to_sentence}" - end + def comparison_method + @comparison_method || :equal? + end + + def expected + @expected + end - private + def compare_to(expected, opts) + @expected, @comparison_method = expected, opts[:using] + end + + def set_expected(expected) + Symbol === expected ? parse_expected(expected) : expected + end + def parse_expected(expected) - if Symbol === expected - @handling_predicate = true - ["be_an_","be_a_","be_"].each do |prefix| - if expected.starts_with?(prefix) - @prefix = prefix - return "#{expected.to_s.sub(@prefix,"")}".to_sym + ["be_an_","be_a_","be_"].each do |prefix| + handling_predicate! + if expected.starts_with?(prefix) + set_prefix(prefix) + expected = expected.to_s.sub(prefix,"") + [true, false, nil].each do |val| + return val if val.to_s == expected end + return expected.to_sym end end - @prefix = "" - return expected + end + + def set_prefix(prefix) + @prefix = prefix + end + + def prefix + @prefix + end + + def handling_predicate! + @handling_predicate = true end def handling_predicate? - return false if [:true, :false, :nil].include?(@expected) + return false if [true, false, nil].include?(expected) return @handling_predicate end @@ -149,21 +124,27 @@ module Spec end def args_to_s - return "" if @args.empty? - inspected_args = @args.collect{|a| a.inspect} - return "(#{inspected_args.join(', ')})" + @args.empty? ? "" : parenthesize(inspected_args.join(', ')) + end + + def parenthesize(string) + return "(#{string})" + end + + def inspected_args + @args.collect{|a| a.inspect} end def comparison - @comparison + @comparison_method.nil? ? " " : "be #{@comparison_method.to_s} " end def expected_to_sentence - split_words(@expected) + split_words(expected) end def prefix_to_sentence - split_words(@prefix) + split_words(prefix) end def split_words(sym) @@ -184,7 +165,6 @@ module Spec end # :call-seq: - # should be # should be_true # should be_false # should be_nil @@ -192,7 +172,7 @@ module Spec # should_not be_nil # should_not be_arbitrary_predicate(*args) # - # Given true, false, or nil, will pass if actual is + # Given true, false, or nil, will pass if actual value is # true, false or nil (respectively). Given no args means # the caller should satisfy an if condition (to be or not to be). # @@ -206,7 +186,6 @@ module Spec # # == Examples # - # target.should be # target.should be_true # target.should be_false # target.should be_nil vendor/plugins/rspec/lib/spec/matchers/be.rb @@ -1,26 +1,6 @@ module Spec module Matchers - class BeClose #:nodoc: - def initialize(expected, delta) - @expected = expected - @delta = delta - end - - def matches?(actual) - @actual = actual - (@actual - @expected).abs < @delta - end - - def failure_message - "expected #{@expected} +/- (< #{@delta}), got #{@actual}" - end - - def description - "be close to #{@expected} (within +- #{@delta})" - end - end - # :call-seq: # should be_close(expected, delta) # should_not be_close(expected, delta) @@ -31,7 +11,11 @@ module Spec # # result.should be_close(3.0, 0.5) def be_close(expected, delta) - Matchers::BeClose.new(expected, delta) + simple_matcher do |actual, matcher| + matcher.failure_message = "expected #{expected} +/- (< #{delta}), got #{actual}" + matcher.description = "be close to #{expected} (within +- #{delta})" + (actual - expected).abs < delta + end end end end vendor/plugins/rspec/lib/spec/matchers/be_close.rb @@ -4,60 +4,60 @@ module Spec #Based on patch from Wilson Bilkovich class Change #:nodoc: def initialize(receiver=nil, message=nil, &block) - @receiver = receiver - @message = message - @block = block + @message = message || "result" + @value_proc = block || lambda { + receiver.__send__(message) + } end - def matches?(target, &block) - if block - raise MatcherError.new(<<-EOF -block passed to should or should_not change must use {} instead of do/end -EOF -) - end - @target = target - execute_change - return false if @from && (@from != @before) - return false if @to && (@to != @after) + def matches?(event_proc) + raise_block_syntax_error if block_given? + + @before = evaluate_value_proc + event_proc.call + @after = evaluate_value_proc + + return false if @from unless @from == @before + return false if @to unless @to == @after return (@before + @amount == @after) if @amount return ((@after - @before) >= @minimum) if @minimum return ((@after - @before) <= @maximum) if @maximum return @before != @after end - def execute_change - @before = @block.nil? ? @receiver.send(@message) : @block.call - @target.call - @after = @block.nil? ? @receiver.send(@message) : @block.call + def raise_block_syntax_error + raise MatcherError.new(<<-MESSAGE +block passed to should or should_not change must use {} instead of do/end +MESSAGE + ) + end + + def evaluate_value_proc + @value_proc.call end def failure_message if @to - "#{result} should have been changed to #{@to.inspect}, but is now #{@after.inspect}" + "#{@message} should have been changed to #{@to.inspect}, but is now #{@after.inspect}" elsif @from - "#{result} should have initially been #{@from.inspect}, but was #{@before.inspect}" + "#{@message} should have initially been #{@from.inspect}, but was #{@before.inspect}" elsif @amount - "#{result} should have been changed by #{@amount.inspect}, but was changed by #{actual_delta.inspect}" + "#{@message} should have been changed by #{@amount.inspect}, but was changed by #{actual_delta.inspect}" elsif @minimum - "#{result} should have been changed by at least #{@minimum.inspect}, but was changed by #{actual_delta.inspect}" + "#{@message} should have been changed by at least #{@minimum.inspect}, but was changed by #{actual_delta.inspect}" elsif @maximum - "#{result} should have been changed by at most #{@maximum.inspect}, but was changed by #{actual_delta.inspect}" + "#{@message} should have been changed by at most #{@maximum.inspect}, but was changed by #{actual_delta.inspect}" else - "#{result} should have changed, but is still #{@before.inspect}" + "#{@message} should have changed, but is still #{@before.inspect}" end end - def result - @message || "result" - end - def actual_delta @after - @before end def negative_failure_message - "#{result} should not have changed, but did change from #{@before.inspect} to #{@after.inspect}" + "#{@message} should not have changed, but did change from #{@before.inspect} to #{@after.inspect}" end def by(amount) @@ -141,8 +141,8 @@ EOF # <tt>change</tt> must use the <tt>{}</tt> form (<tt>do/end</tt> is not # supported). # - def change(target=nil, message=nil, &block) - Matchers::Change.new(target, message, &block) + def change(receiver=nil, message=nil, &block) + Matchers::Change.new(receiver, message, &block) end end end vendor/plugins/rspec/lib/spec/matchers/change.rb @@ -1,29 +1,6 @@ module Spec module Matchers - class Eql #:nodoc: - def initialize(expected) - @expected = expected - end - - def matches?(actual) - @actual = actual - @actual.eql?(@expected) - end - - def failure_message - return "expected #{@expected.inspect}, got #{@actual.inspect} (using .eql?)", @expected, @actual - end - - def negative_failure_message - return "expected #{@actual.inspect} not to equal #{@expected.inspect} (using .eql?)", @expected, @actual - end - - def description - "eql #{@expected.inspect}" - end - end - # :call-seq: # should eql(expected) # should_not eql(expected) @@ -37,7 +14,12 @@ module Spec # 5.should eql(5) # 5.should_not eql(3) def eql(expected) - Matchers::Eql.new(expected) + simple_matcher do |actual, matcher| + matcher.failure_message = "expected #{expected.inspect}, got #{actual.inspect} (using .eql?)", expected, actual + matcher.negative_failure_message = "expected #{actual.inspect} not to equal #{expected.inspect} (using .eql?)", expected, actual + matcher.description = "eql #{expected.inspect}" + actual.eql?(expected) + end end end end vendor/plugins/rspec/lib/spec/matchers/eql.rb @@ -1,29 +1,6 @@ module Spec module Matchers - class Equal #:nodoc: - def initialize(expected) - @expected = expected - end - - def matches?(actual) - @actual = actual - @actual.equal?(@expected) - end - - def failure_message - return "expected #{@expected.inspect}, got #{@actual.inspect} (using .equal?)", @expected, @actual - end - - def negative_failure_message - return "expected #{@actual.inspect} not to equal #{@expected.inspect} (using .equal?)", @expected, @actual - end - - def description - "equal #{@expected.inspect}" - end - end - # :call-seq: # should equal(expected) # should_not equal(expected) @@ -37,7 +14,12 @@ module Spec # 5.should equal(5) #Fixnums are equal # "5".should_not equal("5") #Strings that look the same are not the same object def equal(expected) - Matchers::Equal.new(expected) + simple_matcher do |actual, matcher| + matcher.failure_message = "expected #{expected.inspect}, got #{actual.inspect} (using .equal?)", expected, actual + matcher.negative_failure_message = "expected #{actual.inspect} not to equal #{expected.inspect} (using .equal?)", expected, actual + matcher.description = "equal #{expected.inspect}" + actual.equal?(expected) + end end end end vendor/plugins/rspec/lib/spec/matchers/equal.rb @@ -1,17 +1,16 @@ module Spec module Matchers - class Exist - def matches? actual - @actual = actual - @actual.exist? - end - def failure_message - "expected #{@actual.inspect} to exist, but it doesn't." - end - def negative_failure_message - "expected #{@actual.inspect} to not exist, but it does." + # :call-seq: + # should exist + # should_not exist + # + # Passes if actual.exist? + def exist + simple_matcher do |actual, matcher| + matcher.failure_message = "expected #{actual.inspect} to exist, but it doesn't." + matcher.negative_failure_message = "expected #{actual.inspect} to not exist, but it does." + actual.exist? end end - def exist; Exist.new; end end end vendor/plugins/rspec/lib/spec/matchers/exist.rb @@ -1,34 +1,18 @@ module Spec module Matchers - - class Has #:nodoc: - def initialize(sym, *args) - @sym = sym - @args = args - end - - def matches?(target) - target.send(predicate, *@args) - end - - def failure_message - "expected ##{predicate}(#{@args[0].inspect}) to return true, got false" - end - - def negative_failure_message - "expected ##{predicate}(#{@args[0].inspect}) to return false, got true" + def has(sym, *args) # :nodoc: + simple_matcher do |actual, matcher| + matcher.failure_message = "expected ##{predicate(sym)}(#{args[0].inspect}) to return true, got false" + matcher.negative_failure_message = "expected ##{predicate(sym)}(#{args[0].inspect}) to return false, got true" + matcher.description = "have key #{args[0].inspect}" + actual.__send__(predicate(sym), *args) end - - def description - "have key #{@args[0].inspect}" - end - - private - def predicate - "#{@sym.to_s.sub("have_","has_")}?".to_sym - end - end - + + private + def predicate(sym) + "#{sym.to_s.sub("have_","has_")}?".to_sym + end + end end vendor/plugins/rspec/lib/spec/matchers/has.rb @@ -1,6 +1,5 @@ module Spec module Matchers - class Have #:nodoc: def initialize(expected, relativity=:exactly) @expected = (expected == :no ? 0 : expected) @@ -15,34 +14,22 @@ module Spec } end - def method_missing(sym, *args, &block) - @collection_name = sym - if defined?(ActiveSupport::Inflector) - @plural_collection_name = ActiveSupport::Inflector.pluralize(sym.to_s) - elsif Object.const_defined?(:Inflector) - @plural_collection_name = Inflector.pluralize(sym.to_s) - end - @args = args - @block = block - self - end - def matches?(collection_owner) if collection_owner.respond_to?(@collection_name) - collection = collection_owner.send(@collection_name, *@args, &@block) + collection = collection_owner.__send__(@collection_name, *@args, &@block) elsif (@plural_collection_name && collection_owner.respond_to?(@plural_collection_name)) - collection = collection_owner.send(@plural_collection_name, *@args, &@block) + collection = collection_owner.__send__(@plural_collection_name, *@args, &@block) elsif (collection_owner.respond_to?(:length) || collection_owner.respond_to?(:size)) collection = collection_owner else - collection_owner.send(@collection_name, *@args, &@block) + collection_owner.__send__(@collection_name, *@args, &@block) end - @actual = collection.size if collection.respond_to?(:size) - @actual = collection.length if collection.respond_to?(:length) - raise not_a_collection if @actual.nil? - return @actual >= @expected if @relativity == :at_least - return @actual <= @expected if @relativity == :at_most - return @actual == @expected + @given = collection.size if collection.respond_to?(:size) + @given = collection.length if collection.respond_to?(:length) + raise not_a_collection if @given.nil? + return @given >= @expected if @relativity == :at_least + return @given <= @expected if @relativity == :at_most + return @given == @expected end def not_a_collection @@ -50,12 +37,12 @@ module Spec end def failure_message - "expected #{relative_expectation} #{@collection_name}, got #{@actual}" + "expected #{relative_expectation} #{@collection_name}, got #{@given}" end def negative_failure_message if @relativity == :exactly - return "expected target not to have #{@expected} #{@collection_name}, got #{@actual}" + return "expected target not to have #{@expected} #{@collection_name}, got #{@given}" elsif @relativity == :at_most return <<-EOF Isn't life confusing enough? @@ -79,8 +66,22 @@ EOF "have #{relative_expectation} #{@collection_name}" end + def respond_to?(sym) + @expected.respond_to?(sym) || super + end + private + def method_missing(sym, *args, &block) + @collection_name = sym + if inflector = (defined?(ActiveSupport::Inflector) ? ActiveSupport::Inflector : (defined?(Inflector) ? Inflector : nil)) + @plural_collection_name = inflector.pluralize(sym.to_s) + end + @args = args + @block = block + self + end + def relative_expectation "#{relativities[@relativity]}#{@expected}" end vendor/plugins/rspec/lib/spec/matchers/have.rb @@ -10,7 +10,17 @@ module Spec def matches?(actual) @actual = actual @expecteds.each do |expected| - return false unless actual.include?(expected) + if actual.is_a?(Hash) + if expected.is_a?(Hash) + expected.each_pair do |k,v| + return false unless actual[k] == v + end + else + return false unless actual.has_key?(expected) + end + else + return false unless actual.include?(expected) + end end true end vendor/plugins/rspec/lib/spec/matchers/include.rb @@ -1,30 +1,6 @@ module Spec module Matchers - class Match #:nodoc: - def initialize(expected) - @expected = expected - end - - def matches?(actual) - @actual = actual - return true if actual =~ @expected - return false - end - - def failure_message - return "expected #{@actual.inspect} to match #{@expected.inspect}", @expected, @actual - end - - def negative_failure_message - return "expected #{@actual.inspect} not to match #{@expected.inspect}", @expected, @actual - end - - def description - "match #{@expected.inspect}" - end - end - # :call-seq: # should match(regexp) # should_not match(regexp) @@ -33,9 +9,14 @@ module Spec # # == Examples # - # email.should match(/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i) + # email.should match(/^([^\s]+)((?:[-a-z0-9]+\.)+[a-z]{2,})$/i) def match(regexp) - Matchers::Match.new(regexp) + simple_matcher do |actual, matcher| + matcher.failure_message = "expected #{actual.inspect} to match #{regexp.inspect}", regexp, actual + matcher.negative_failure_message = "expected #{actual.inspect} not to match #{regexp.inspect}", regexp, actual + matcher.description = "match #{regexp.inspect}" + actual =~ regexp + end end end end vendor/plugins/rspec/lib/spec/matchers/match.rb @@ -1,70 +1,73 @@ module Spec module Matchers - class BaseOperatorMatcher - attr_reader :generated_description - - def initialize(target) - @target = target - end - def ==(expected) - @expected = expected - __delegate_method_missing_to_target("==", expected) - end + class OperatorMatcher + @operator_registry = {} - def ===(expected) - @expected = expected - __delegate_method_missing_to_target("===", expected) + def self.register(klass, operator, matcher) + @operator_registry[klass] ||= {} + @operator_registry[klass][operator] = matcher end - def =~(expected) - @expected = expected - __delegate_method_missing_to_target("=~", expected) + def self.get(klass, operator) + return @operator_registry[klass][operator] if @operator_registry[klass] + nil end - def >(expected) - @expected = expected - __delegate_method_missing_to_target(">", expected) + def initialize(actual) + @actual = actual end - def >=(expected) - @expected = expected - __delegate_method_missing_to_target(">=", expected) + def self.use_custom_matcher_or_delegate(operator) + define_method(operator) do |expected| + if matcher = OperatorMatcher.get(@actual.class, operator) + return @actual.send(matcher_method, matcher.new(expected)) + else + ::Spec::Matchers.last_matcher = self + @operator, @expected = operator, expected + __delegate_operator(@actual, operator, expected) + end + end end - def <(expected) - @expected = expected - __delegate_method_missing_to_target("<", expected) + ['==', '===', '=~', '>', '>=', '<', '<='].each do |operator| + use_custom_matcher_or_delegate operator end - def <=(expected) - @expected = expected - __delegate_method_missing_to_target("<=", expected) + def fail_with_message(message) + Spec::Expectations.fail_with(message, @expected, @actual) end - def fail_with_message(message) - Spec::Expectations.fail_with(message, @expected, @target) + def description + "#{@operator} #{@expected.inspect}" end end - class PositiveOperatorMatcher < BaseOperatorMatcher #:nodoc: + class PositiveOperatorMatcher < OperatorMatcher #:nodoc: + def matcher_method + :should + end - def __delegate_method_missing_to_target(operator, expected) - ::Spec::Matchers.generated_description = "should #{operator} #{expected.inspect}" - return true if @target.send(operator, expected) - return fail_with_message("expected: #{expected.inspect},\n got: #{@target.inspect} (using #{operator})") if ['==','===', '=~'].include?(operator) - return fail_with_message("expected: #{operator} #{expected.inspect},\n got: #{operator.gsub(/./, ' ')} #{@target.inspect}") + def __delegate_operator(actual, operator, expected) + return true if actual.__send__(operator, expected) + if ['==','===', '=~'].include?(operator) + fail_with_message("expected: #{expected.inspect},\n got: #{actual.inspect} (using #{operator})") + else + fail_with_message("expected: #{operator} #{expected.inspect},\n got: #{operator.gsub(/./, ' ')} #{actual.inspect}") + end end end - class NegativeOperatorMatcher < BaseOperatorMatcher #:nodoc: + class NegativeOperatorMatcher < OperatorMatcher #:nodoc: + def matcher_method + :should_not + end - def __delegate_method_missing_to_target(operator, expected) - ::Spec::Matchers.generated_description = "should not #{operator} #{expected.inspect}" - return true unless @target.send(operator, expected) - return fail_with_message("expected not: #{operator} #{expected.inspect},\n got: #{operator.gsub(/./, ' ')} #{@target.inspect}") + def __delegate_operator(actual, operator, expected) + return true unless actual.__send__(operator, expected) + return fail_with_message("expected not: #{operator} #{expected.inspect},\n got: #{operator.gsub(/./, ' ')} #{actual.inspect}") end end vendor/plugins/rspec/lib/spec/matchers/operator_matcher.rb @@ -1,27 +1,27 @@ module Spec module Matchers class RaiseError #:nodoc: - def initialize(error_or_message=Exception, message=nil, &block) + def initialize(expected_error_or_message=Exception, expected_message=nil, &block) @block = block - case error_or_message + case expected_error_or_message when String, Regexp - @expected_error, @expected_message = Exception, error_or_message + @expected_error, @expected_message = Exception, expected_error_or_message else - @expected_error, @expected_message = error_or_message, message + @expected_error, @expected_message = expected_error_or_message, expected_message end end - def matches?(proc) + def matches?(given_proc) @raised_expected_error = false @with_expected_message = false @eval_block = false @eval_block_passed = false begin - proc.call - rescue @expected_error => @actual_error + given_proc.call + rescue @expected_error => @given_error @raised_expected_error = true @with_expected_message = verify_message - rescue Exception => @actual_error + rescue Exception => @given_error # This clause should be empty, but rcov will not report it as covered # unless something (anything) is executed within the clause rcov_error_report = "http://eigenclass.org/hiki.rb?rcov-0.8.0" @@ -37,34 +37,30 @@ module Spec def eval_block @eval_block = true begin - @block[@actual_error] + @block[@given_error] @eval_block_passed = true rescue Exception => err - @actual_error = err + @given_error = err end end def verify_message case @expected_message when nil - return true + true when Regexp - return @expected_message =~ @actual_error.message + @expected_message =~ @given_error.message else - return @expected_message == @actual_error.message + @expected_message == @given_error.message end end def failure_message - if @eval_block - return @actual_error.message - else - return "expected #{expected_error}#{actual_error}" - end + @eval_block ? @given_error.message : "expected #{expected_error}#{given_error}" end def negative_failure_message - "expected no #{expected_error}#{actual_error}" + "expected no #{expected_error}#{given_error}" end def description @@ -83,8 +79,8 @@ module Spec end end - def actual_error - @actual_error.nil? ? " but nothing was raised" : ", got #{@actual_error.inspect}" + def given_error + @given_error.nil? ? " but nothing was raised" : ", got #{@given_error.inspect}" end def negative_expectation? vendor/plugins/rspec/lib/spec/matchers/raise_error.rb @@ -4,28 +4,54 @@ module Spec class RespondTo #:nodoc: def initialize(*names) @names = names + @expected_arity = nil @names_not_responded_to = [] end - def matches?(target) + def matches?(actual) + @actual = actual @names.each do |name| - unless target.respond_to?(name) - @names_not_responded_to << name - end + @names_not_responded_to << name unless actual.respond_to?(name) && matches_arity?(actual, name) end return @names_not_responded_to.empty? end def failure_message - "expected target to respond to #{@names_not_responded_to.collect {|name| name.inspect }.join(', ')}" + "expected #{@actual.inspect} to respond to #{@names_not_responded_to.collect {|name| name.inspect }.join(', ')}#{with_arity}" end def negative_failure_message - "expected target not to respond to #{@names.collect {|name| name.inspect }.join(', ')}" + "expected #{@actual.inspect} not to respond to #{@names.collect {|name| name.inspect }.join(', ')}" end def description - "respond to ##{@names.to_s}" + # Ruby 1.9 returns the same thing for array.to_s as array.inspect, so just use array.inspect here + "respond to #{pp_names}#{with_arity}" + end + + def with(n) + @expected_arity = n + self + end + + def argument + self + end + alias :arguments :argument + + private + + def matches_arity?(actual, name) + @expected_arity.nil?? true : @expected_arity == actual.method(name).arity + end + + def with_arity + @expected_arity.nil?? "" : + " with #{@expected_arity} argument#{@expected_arity == 1 ? '' : 's'}" + end + + def pp_names + @names.length == 1 ? "##{@names.first}" : @names.inspect end end vendor/plugins/rspec/lib/spec/matchers/respond_to.rb @@ -6,18 +6,18 @@ module Spec @block = block end - def matches?(actual, &block) + def matches?(given, &block) @block = block if block - @actual = actual - @block.call(actual) + @given = given + @block.call(given) end def failure_message - "expected #{@actual} to satisfy block" + "expected #{@given} to satisfy block" end def negative_failure_message - "expected #{@actual} not to satisfy block" + "expected #{@given} not to satisfy block" end end vendor/plugins/rspec/lib/spec/matchers/satisfy.rb @@ -8,13 +8,13 @@ module Spec @match_block = match_block end - def matches?(actual) - @actual = actual + def matches?(given) + @given = given case @match_block.arity when 2 - @match_block.call(@actual, self) + @match_block.call(@given, self) else - @match_block.call(@actual) + @match_block.call(@given) end end @@ -23,11 +23,11 @@ module Spec end def failure_message - @failure_message || (@description.nil? ? explanation : %[expected #{@description.inspect} but got #{@actual.inspect}]) + @failure_message || (@description.nil? ? explanation : %[expected #{@description.inspect} but got #{@given.inspect}]) end def negative_failure_message - @negative_failure_message || (@description.nil? ? explanation : %[expected not to get #{@description.inspect}, but got #{@actual.inspect}]) + @negative_failure_message || (@description.nil? ? explanation : %[expected not to get #{@description.inspect}, but got #{@given.inspect}]) end def explanation @@ -81,7 +81,7 @@ module Spec # simple_matcher("rhyme with #{expected.inspect}") do |given, matcher| # matcher.failure_message = "expected #{given.inspect} to rhyme with #{expected.inspect}" # matcher.negative_failure_message = "expected #{given.inspect} not to rhyme with #{expected.inspect}" - # actual.rhymes_with? expected + # given.rhymes_with? expected # end # end # @@ -92,7 +92,7 @@ module Spec # matcher.description = "rhyme with #{expected.inspect}" # matcher.failure_message = "expected #{given.inspect} to rhyme with #{expected.inspect}" # matcher.negative_failure_message = "expected #{given.inspect} not to rhyme with #{expected.inspect}" - # actual.rhymes_with? expected + # given.rhymes_with? expected # end # end # vendor/plugins/rspec/lib/spec/matchers/simple_matcher.rb @@ -2,39 +2,60 @@ module Spec module Matchers class ThrowSymbol #:nodoc: - def initialize(expected=nil) - @expected = expected - @actual = nil + def initialize(expected_symbol = nil, expected_arg=nil) + @expected_symbol = expected_symbol + @expected_arg = expected_arg + @caught_symbol = nil end - def matches?(proc) + def matches?(given_proc) begin - proc.call - rescue NameError => e - raise e unless e.message =~ /uncaught throw/ - @actual = e.name.to_sym + if @expected_symbol.nil? + given_proc.call + else + @caught_arg = catch :proc_did_not_throw_anything do + catch @expected_symbol do + given_proc.call + throw :proc_did_not_throw_anything, :nothing_thrown + end + end + @caught_symbol = @expected_symbol unless @caught_arg == :nothing_thrown + end + + # Ruby 1.8 uses NameError with `symbol' + # Ruby 1.9 uses ArgumentError with :symbol + rescue NameError, ArgumentError => e + raise e unless e.message =~ /uncaught throw (`|\:)([a-zA-Z0-9_]*)(')?/ + @caught_symbol = $2.to_sym + ensure - if @expected.nil? - return @actual.nil? ? false : true + if @expected_symbol.nil? + return !@caught_symbol.nil? else - return @actual == @expected + if @expected_arg.nil? + return @caught_symbol == @expected_symbol + else + # puts [@caught_symbol, @expected_symbol].inspect + # puts [@caught_arg, @expected_arg].inspect + return @caught_symbol == @expected_symbol && @caught_arg == @expected_arg + end end end end def failure_message - if @actual - "expected #{expected}, got #{@actual.inspect}" + if @caught_symbol + "expected #{expected}, got #{@caught_symbol.inspect}" else "expected #{expected} but nothing was thrown" end end def negative_failure_message - if @expected + if @expected_symbol "expected #{expected} not to be thrown" else - "expected no Symbol, got :#{@actual}" + "expected no Symbol, got :#{@caught_symbol}" end end @@ -45,7 +66,11 @@ module Spec private def expected - @expected.nil? ? "a Symbol" : @expected.inspect + @expected_symbol.nil? ? "a Symbol" : "#{@expected_symbol.inspect}#{args}" + end + + def args + @expected_arg.nil? ? "" : " with #{@expected_arg.inspect}" end end @@ -53,20 +78,27 @@ module Spec # :call-seq: # should throw_symbol() # should throw_symbol(:sym) + # should throw_symbol(:sym, arg) # should_not throw_symbol() # should_not throw_symbol(:sym) - # - # Given a Symbol argument, matches if a proc throws the specified Symbol. + # should_not throw_symbol(:sym, arg) # # Given no argument, matches if a proc throws any Symbol. # + # Given a Symbol, matches if the given proc throws the specified Symbol. + # + # Given a Symbol and an arg, matches if the given proc throws the + # specified Symbol with the specified arg. + # # == Examples # # lambda { do_something_risky }.should throw_symbol # lambda { do_something_risky }.should throw_symbol(:that_was_risky) + # lambda { do_something_risky }.should throw_symbol(:that_was_risky, culprit) # # lambda { do_something_risky }.should_not throw_symbol # lambda { do_something_risky }.should_not throw_symbol(:that_was_risky) + # lambda { do_something_risky }.should_not throw_symbol(:that_was_risky, culprit) def throw_symbol(sym=nil) Matchers::ThrowSymbol.new(sym) end vendor/plugins/rspec/lib/spec/matchers/throw_symbol.rb @@ -1,16 +1,5 @@ require 'spec/mocks/framework' -require 'spec/mocks/methods' -require 'spec/mocks/argument_constraint_matchers' -require 'spec/mocks/spec_methods' -require 'spec/mocks/proxy' -require 'spec/mocks/mock' -require 'spec/mocks/argument_expectation' -require 'spec/mocks/message_expectation' -require 'spec/mocks/order_group' -require 'spec/mocks/errors' -require 'spec/mocks/error_generator' require 'spec/mocks/extensions/object' -require 'spec/mocks/space' module Spec # == Mocks and Stubs vendor/plugins/rspec/lib/spec/mocks.rb @@ -1,215 +1,48 @@ module Spec module Mocks - - class MatcherConstraint - def initialize(matcher) - @matcher = matcher - end - - def matches?(value) - @matcher.matches?(value) - end - end - - class LiteralArgConstraint - def initialize(literal) - @literal_value = literal - end - - def matches?(value) - @literal_value == value - end - end - - class RegexpArgConstraint - def initialize(regexp) - @regexp = regexp - end - - def matches?(value) - return value =~ @regexp unless value.is_a?(Regexp) - value == @regexp - end - end - - class AnyArgConstraint - def initialize(ignore) - end - - def ==(other) - true - end - - # TODO - need this? - def matches?(value) - true - end - end - - class AnyArgsConstraint - def description - "any args" - end - end - - class NoArgsConstraint - def description - "no args" - end - - def ==(args) - args == [] - end - end - - class NumericArgConstraint - def initialize(ignore) - end - - def matches?(value) - value.is_a?(Numeric) - end - end - - class BooleanArgConstraint - def initialize(ignore) - end - - def ==(value) - matches?(value) - end - - def matches?(value) - return true if value.is_a?(TrueClass) - return true if value.is_a?(FalseClass) - false - end - end - - class StringArgConstraint - def initialize(ignore) - end - - def matches?(value) - value.is_a?(String) - end - end - - class DuckTypeArgConstraint - def initialize(*methods_to_respond_to) - @methods_to_respond_to = methods_to_respond_to - end - - def matches?(value) - @methods_to_respond_to.all? { |sym| value.respond_to?(sym) } - end - - def description - "duck_type" - end - end - - class HashIncludingConstraint - def initialize(expected) - @expected = expected - end - - def ==(actual) - @expected.each do | key, value | - # check key for case that value evaluates to nil - return false unless actual.has_key?(key) && actual[key] == value - end - true - rescue NoMethodError => ex - return false - end - - def matches?(value) - self == value - end - - def description - "hash_including(#{@expected.inspect.sub(/^\{/,"").sub(/\}$/,"")})" - end - - end - class ArgumentExpectation attr_reader :args - @@constraint_classes = Hash.new { |hash, key| LiteralArgConstraint} - @@constraint_classes[:anything] = AnyArgConstraint - @@constraint_classes[:numeric] = NumericArgConstraint - @@constraint_classes[:boolean] = BooleanArgConstraint - @@constraint_classes[:string] = StringArgConstraint def initialize(args, &block) @args = args @constraints_block = block - if [:any_args] == args - @expected_params = nil - warn_deprecated(:any_args.inspect, "any_args()") - elsif args.length == 1 && args[0].is_a?(AnyArgsConstraint) then @expected_params = nil - elsif [:no_args] == args - @expected_params = [] - warn_deprecated(:no_args.inspect, "no_args()") - elsif args.length == 1 && args[0].is_a?(NoArgsConstraint) then @expected_params = [] - else @expected_params = process_arg_constraints(args) + if ArgumentConstraints::AnyArgsConstraint === args.first + @match_any_args = true + elsif ArgumentConstraints::NoArgsConstraint === args.first + @constraints = [] + else + @constraints = args.collect {|arg| constraint_for(arg)} end end - def process_arg_constraints(constraints) - constraints.collect do |constraint| - convert_constraint(constraint) - end + def constraint_for(arg) + return ArgumentConstraints::MatcherConstraint.new(arg) if is_matcher?(arg) + return ArgumentConstraints::RegexpConstraint.new(arg) if arg.is_a?(Regexp) + return ArgumentConstraints::EqualityProxy.new(arg) end - def warn_deprecated(deprecated_method, instead) - Kernel.warn "The #{deprecated_method} constraint is deprecated. Use #{instead} instead." + def is_matcher?(obj) + return obj.respond_to?(:matches?) && obj.respond_to?(:description) end - def convert_constraint(constraint) - if [:anything, :numeric, :boolean, :string].include?(constraint) - case constraint - when :anything - instead = "anything()" - when :boolean - instead = "boolean()" - when :numeric - instead = "an_instance_of(Numeric)" - when :string - instead = "an_instance_of(String)" - end - warn_deprecated(constraint.inspect, instead) - return @@constraint_classes[constraint].new(constraint) - end - return MatcherConstraint.new(constraint) if is_matcher?(constraint) - return RegexpArgConstraint.new(constraint) if constraint.is_a?(Regexp) - return LiteralArgConstraint.new(constraint) + def args_match?(given_args) + match_any_args? || constraints_block_matches?(given_args) || constraints_match?(given_args) end - def is_matcher?(obj) - return obj.respond_to?(:matches?) && obj.respond_to?(:description) + def constraints_block_matches?(given_args) + @constraints_block ? @constraints_block.call(*given_args) : nil end - def check_args(args) - if @constraints_block - @constraints_block.call(*args) - return true - end - - return true if @expected_params.nil? - return true if @expected_params == args - return constraints_match?(args) + def constraints_match?(given_args) + @constraints == given_args end - def constraints_match?(args) - return false if args.length != @expected_params.length - @expected_params.each_index { |i| return false unless @expected_params[i].matches?(args[i]) } - return true + def match_any_args? + @match_any_args end - + end end vendor/plugins/rspec/lib/spec/mocks/argument_expectation.rb @@ -44,7 +44,7 @@ module Spec private def intro - @name ? "Mock '#{@name}'" : @target.inspect + @name ? "Mock '#{@name}'" : @target.class == Class ? "<#{@target.inspect} (class)>" : (@target.nil? ? "nil" : @target.to_s) end def __raise(message) vendor/plugins/rspec/lib/spec/mocks/error_generator.rb @@ -3,7 +3,7 @@ # object in the system. require 'spec/mocks/methods' -require 'spec/mocks/argument_constraint_matchers' +require 'spec/mocks/argument_constraints' require 'spec/mocks/spec_methods' require 'spec/mocks/proxy' require 'spec/mocks/mock' vendor/plugins/rspec/lib/spec/mocks/framework.rb @@ -3,6 +3,10 @@ module Spec class BaseExpectation attr_reader :sym + attr_writer :expected_received_count, :method_block, :expected_from + protected :expected_received_count=, :method_block=, :expected_from= + attr_accessor :error_generator + protected :error_generator, :error_generator= def initialize(error_generator, expectation_ordering, expected_from, sym, method_block, expected_received_count=1, opts={}) @error_generator = error_generator @@ -13,7 +17,7 @@ module Spec @return_block = nil @actual_received_count = 0 @expected_received_count = expected_received_count - @args_expectation = ArgumentExpectation.new([AnyArgsConstraint.new]) + @args_expectation = ArgumentExpectation.new([ArgumentConstraints::AnyArgsConstraint.new]) @consecutive = false @exception_to_raise = nil @symbol_to_throw = nil @@ -23,6 +27,19 @@ module Spec @args_to_yield = [] end + def build_child(expected_from, method_block, expected_received_count, opts={}) + child = clone + child.expected_from = expected_from + child.method_block = method_block + child.expected_received_count = expected_received_count + child.clear_actual_received_count! + new_gen = error_generator.clone + new_gen.opts = opts + child.error_generator = new_gen + child.clone_args_to_yield @args_to_yield + child + end + def expected_args @args_expectation.args end @@ -63,16 +80,22 @@ module Spec end def and_yield(*args) + if @args_to_yield_were_cloned + @args_to_yield.clear + @args_to_yield_were_cloned = false + end + @args_to_yield << args self end - + def matches(sym, args) - @sym == sym and @args_expectation.check_args(args) + @sym == sym and @args_expectation.args_match?(args) end def invoke(args, block) if @expected_received_count == 0 + @failed_fast = true @actual_received_count += 1 @error_generator.raise_expectation_error @sym, @expected_received_count, @actual_received_count, *args end @@ -103,6 +126,11 @@ module Spec @actual_received_count += 1 end end + + def called_max_times? + @expected_received_count != :any && @expected_received_count > 0 && + @actual_received_count >= @expected_received_count + end protected @@ -147,16 +175,25 @@ module Spec @return_block.call(*args) end end + + def clone_args_to_yield(args) + @args_to_yield = args.clone + @args_to_yield_were_cloned = true + end + + def failed_fast? + @failed_fast + end end class MessageExpectation < BaseExpectation def matches_name_but_not_args(sym, args) - @sym == sym and not @args_expectation.check_args(args) + @sym == sym and not @args_expectation.args_match?(args) end - def verify_messages_received - return if expected_messages_received? + def verify_messages_received + return if expected_messages_received? || failed_fast? generate_error rescue Spec::Mocks::MockExpectationError => error @@ -273,6 +310,10 @@ module Spec 2 end end + + def clear_actual_received_count! + @actual_received_count = 0 + end end vendor/plugins/rspec/lib/spec/mocks/message_expectation.rb @@ -9,8 +9,12 @@ module Spec __mock_proxy.add_negative_message_expectation(caller(1)[0], sym.to_sym, &block) end - def stub!(sym, opts={}) - __mock_proxy.add_stub(caller(1)[0], sym.to_sym, opts) + def stub!(sym_or_hash, opts={}) + if Hash === sym_or_hash + sym_or_hash.each {|method, value| stub!(method).and_return value } + else + __mock_proxy.add_stub(caller(1)[0], sym_or_hash.to_sym, opts) + end end def received_message?(sym, *args, &block) #:nodoc: @@ -24,6 +28,14 @@ module Spec def rspec_reset #:nodoc: __mock_proxy.reset end + + def as_null_object + __mock_proxy.as_null_object + end + + def null_object? + __mock_proxy.null_object? + end private @@ -31,7 +43,7 @@ module Spec if Mock === self @mock_proxy ||= Proxy.new(self, @name, @options) else - @mock_proxy ||= Proxy.new(self, self.class.name) + @mock_proxy ||= Proxy.new(self) end end end vendor/plugins/rspec/lib/spec/mocks/methods.rb @@ -4,8 +4,18 @@ module Spec DEFAULT_OPTIONS = { :null_object => false, } + + @@warn_about_expectations_on_nil = true + + def self.allow_message_expectations_on_nil + @@warn_about_expectations_on_nil = false + + # ensure nil.rspec_verify is called even if an expectation is not set in the example + # otherwise the allowance would effect subsequent examples + $rspec_mocks.add(nil) unless $rspec_mocks.nil? + end - def initialize(target, name, options={}) + def initialize(target, name=nil, options={}) @target = target @name = name @error_generator = ErrorGenerator.new target, name @@ -20,15 +30,27 @@ module Spec def null_object? @options[:null_object] end + + def as_null_object + @options[:null_object] = true + @target + end - def add_message_expectation(expected_from, sym, opts={}, &block) + def add_message_expectation(expected_from, sym, opts={}, &block) __add sym - @expectations << MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil, 1, opts) + warn_if_nil_class sym + if existing_stub = @stubs.detect {|s| s.sym == sym } + expectation = existing_stub.build_child(expected_from, block_given?? block : nil, 1, opts) + else + expectation = MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil, 1, opts) + end + @expectations << expectation @expectations.last end def add_negative_message_expectation(expected_from, sym, &block) __add sym + warn_if_nil_class sym @expectations << NegativeMessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil) @expectations.last end @@ -38,7 +60,7 @@ module Spec @stubs.unshift MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, nil, :any, opts) @stubs.first end - + def verify #:nodoc: verify_expectations ensure @@ -50,6 +72,7 @@ module Spec clear_stubs reset_proxied_methods clear_proxied_methods + reset_nil_expectations_warning end def received_message?(sym, *args, &block) @@ -61,18 +84,21 @@ module Spec end def message_received(sym, *args, &block) - if expectation = find_matching_expectation(sym, *args) - expectation.invoke(args, block) - elsif (stub = find_matching_method_stub(sym, *args)) + expectation = find_matching_expectation(sym, *args) + stub = find_matching_method_stub(sym, *args) + + if (stub && expectation && expectation.called_max_times?) || (stub && !expectation) if expectation = find_almost_matching_expectation(sym, *args) expectation.advise(args, block) unless expectation.expected_messages_received? end stub.invoke([], block) + elsif expectation + expectation.invoke(args, block) elsif expectation = find_almost_matching_expectation(sym, *args) expectation.advise(args, block) if null_object? unless expectation.expected_messages_received? raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(sym) or null_object?) else - @target.send :method_missing, sym, *args, &block + @target.__send__ :method_missing, sym, *args, &block end end @@ -91,16 +117,24 @@ module Spec define_expected_method(sym) end + def warn_if_nil_class(sym) + if proxy_for_nil_class? && @@warn_about_expectations_on_nil + Kernel.warn("An expectation of :#{sym} was set on nil. Called from #{caller[2]}. Use allow_message_expectations_on_nil to disable warnings.") + end + end + def define_expected_method(sym) visibility_string = "#{visibility(sym)} :#{sym}" - if target_responds_to?(sym) && !target_metaclass.method_defined?(munge(sym)) - munged_sym = munge(sym) - target_metaclass.instance_eval do - alias_method munged_sym, sym if method_defined?(sym.to_s) + unless @proxied_methods.include?(sym) + if target_responds_to?(sym) + munged_sym = munge(sym) + target_metaclass.instance_eval do + alias_method munged_sym, sym if method_defined?(sym.to_s) + end + @proxied_methods << sym end - @proxied_methods << sym end - + target_metaclass.class_eval(<<-EOF, __FILE__, __LINE__) def #{sym}(*args, &block) __mock_proxy.message_received :#{sym}, *args, &block @@ -110,9 +144,9 @@ module Spec end def target_responds_to?(sym) - return @target.send(munge(:respond_to?),sym) if @already_proxied_respond_to + return @target.__send__(munge(:respond_to?),sym) if @already_proxied_respond_to return @already_proxied_respond_to = true if sym == :respond_to? - return @target.respond_to?(sym) + return @target.respond_to?(sym, true) end def visibility(sym) @@ -161,11 +195,19 @@ module Spec alias_method sym, munged_sym undef_method munged_sym else - undef_method sym + remove_method sym end end end end + + def proxy_for_nil_class? + @target.nil? + end + + def reset_nil_expectations_warning + @@warn_about_expectations_on_nil = true if proxy_for_nil_class? + end def find_matching_expectation(sym, *args) @expectations.find {|expectation| expectation.matches(sym, args)} vendor/plugins/rspec/lib/spec/mocks/proxy.rb @@ -1,7 +1,7 @@ module Spec module Mocks module ExampleMethods - include Spec::Mocks::ArgumentConstraintMatchers + include Spec::Mocks::ArgumentConstraints # Shortcut for creating an instance of Spec::Mocks::Mock. # @@ -32,6 +32,14 @@ module Spec def stub_everything(name = 'stub') mock(name, :null_object => true) end + + # Disables warning messages about expectations being set on nil. + # + # By default warning messages are issued when expectations are set on nil. This is to + # prevent false-positives and to catch potential bugs early on. + def allow_message_expectations_on_nil + Proxy.allow_message_expectations_on_nil + end end end vendor/plugins/rspec/lib/spec/mocks/spec_methods.rb @@ -56,12 +56,10 @@ module Spec # end # class SpecTask < ::Rake::TaskLib - class << self - def attr_accessor(*names) - super(*names) - names.each do |name| - module_eval "def #{name}() evaluate(@#{name}) end" # Allows use of procs - end + def self.attr_accessor(*names) + super(*names) + names.each do |name| + module_eval "def #{name}() evaluate(@#{name}) end" # Allows use of procs end end @@ -107,7 +105,7 @@ module Spec # A message to print to stderr when there are failures. attr_accessor :failure_message - # Where RSpec's output is written. Defaults to STDOUT. + # Where RSpec's output is written. Defaults to $stdout. # DEPRECATED. Use --format FORMAT:WHERE in spec_opts. attr_accessor :out vendor/plugins/rspec/lib/spec/rake/spectask.rb @@ -35,11 +35,11 @@ module RCov def define desc "Verify that rcov coverage is at least #{threshold}%" task @name do - total_coverage = nil + total_coverage = 0 File.open(index_html).each_line do |line| - if line =~ /<tt class='coverage_total'>(\d+\.\d+)%<\/tt>/ - total_coverage = eval($1) + if line =~ /<tt class='coverage_total'>\s*(\d+\.\d+)%\s*<\/tt>/ + total_coverage = $1.to_f break end end vendor/plugins/rspec/lib/spec/rake/verify_rcov.rb @@ -1,3 +1,4 @@ +require 'spec/runner/configuration' require 'spec/runner/options' require 'spec/runner/option_parser' require 'spec/runner/example_group_runner' @@ -9,166 +10,22 @@ require 'spec/runner/spec_parser' require 'spec/runner/class_and_arguments_parser' module Spec - # == ExampleGroups and Examples - # - # Rather than expressing examples in classes, RSpec uses a custom DSLL (DSL light) to - # describe groups of examples. - # - # A ExampleGroup is the equivalent of a fixture in xUnit-speak. It is a metaphor for the context - # in which you will run your executable example - a set of known objects in a known starting state. - # We begin be describing - # - # describe Account do - # - # before do - # @account = Account.new - # end - # - # it "should have a balance of $0" do - # @account.balance.should == Money.new(0, :dollars) - # end - # - # end - # - # We use the before block to set up the Example (given), and then the #it method to - # hold the example code that expresses the event (when) and the expected outcome (then). - # - # == Helper Methods - # - # A primary goal of RSpec is to keep the examples clear. We therefore prefer - # less indirection than you might see in xUnit examples and in well factored, DRY production code. We feel - # that duplication is OK if removing it makes it harder to understand an example without - # having to look elsewhere to understand its context. - # - # That said, RSpec does support some level of encapsulating common code in helper - # methods that can exist within a context or within an included module. - # - # == Setup and Teardown - # - # You can use before and after within a Example. Both methods take an optional - # scope argument so you can run the block before :each example or before :all examples - # - # describe "..." do - # before :all do - # ... - # end - # - # before :each do - # ... - # end - # - # it "should do something" do - # ... - # end - # - # it "should do something else" do - # ... - # end - # - # after :each do - # ... - # end - # - # after :all do - # ... - # end - # - # end - # - # The <tt>before :each</tt> block will run before each of the examples, once for each example. Likewise, - # the <tt>after :each</tt> block will run after each of the examples. - # - # It is also possible to specify a <tt>before :all</tt> and <tt>after :all</tt> - # block that will run only once for each behaviour, respectively before the first <code>before :each</code> - # and after the last <code>after :each</code>. The use of these is generally discouraged, because it - # introduces dependencies between the examples. Still, it might prove useful for very expensive operations - # if you know what you are doing. - # - # == Local helper methods - # - # You can include local helper methods by simply expressing them within a context: - # - # describe "..." do - # - # it "..." do - # helper_method - # end - # - # def helper_method - # ... - # end - # - # end - # - # == Included helper methods - # - # You can include helper methods in multiple contexts by expressing them within - # a module, and then including that module in your context: - # - # module AccountExampleHelperMethods - # def helper_method - # ... - # end - # end - # - # describe "A new account" do - # include AccountExampleHelperMethods - # before do - # @account = Account.new - # end - # - # it "should have a balance of $0" do - # helper_method - # @account.balance.should eql(Money.new(0, :dollars)) - # end - # end - # - # == Shared Example Groups - # - # You can define a shared Example Group, that may be used on other groups - # - # share_examples_for "All Editions" do - # it "all editions behaviour" ... - # end - # - # describe SmallEdition do - # it_should_behave_like "All Editions" - # - # it "should do small edition stuff" do - # ... - # end - # end - # - # You can also assign the shared group to a module and include that - # - # share_as :AllEditions do - # it "should do all editions stuff" ... - # end - # - # describe SmallEdition do - # it_should_behave_like AllEditions - # - # it "should do small edition stuff" do - # ... - # end - # end - # - # And, for those of you who prefer to use something more like Ruby, you - # can just include the module directly - # - # describe SmallEdition do - # include AllEditions - # - # it "should do small edition stuff" do - # ... - # end - # end module Runner + + class ExampleGroupCreationListener + def register_example_group(klass) + Spec::Runner.options.add_example_group klass + Spec::Runner.register_at_exit_hook + end + end + + Spec::Example::ExampleGroupMethods.example_group_creation_listeners << ExampleGroupCreationListener.new + class << self def configuration # :nodoc: - @configuration ||= Spec::Example::Configuration.new + @configuration ||= Spec::Runner::Configuration.new end - + # Use this to configure various configurable aspects of # RSpec: # @@ -177,25 +34,55 @@ module Spec # end # # The yielded <tt>configuration</tt> object is a - # Spec::Example::Configuration instance. See its RDoc + # Spec::Runner::Configuration instance. See its RDoc # for details about what you can do with it. # def configure yield configuration end - + def register_at_exit_hook # :nodoc: - $spec_runner_at_exit_hook_registered ||= nil - unless $spec_runner_at_exit_hook_registered + unless @already_registered_at_exit_hook at_exit do - unless $! || Spec.run? - success = Spec.run - exit success if Spec.exit? + unless $! || run? || Spec::Example::ExampleGroupFactory.registered_or_ancestor_of_registered?(options.example_groups) + success = run + exit success if exit? end end - $spec_runner_at_exit_hook_registered = true + @already_registered_at_exit_hook = true + end + end + + def options # :nodoc: + @options ||= begin + parser = ::Spec::Runner::OptionParser.new($stderr, $stdout) + parser.order!(ARGV) + parser.options end end + + def use options + @options = options + end + + def test_unit_defined? + Object.const_defined?(:Test) && Test.const_defined?(:Unit) && Test::Unit.respond_to?(:run?) + end + + def run? + Runner.options.examples_run? + end + + def run + return true if run? + options.run_examples + end + + def exit? + !test_unit_defined? || Test::Unit.run? + end end end end + +require 'spec/interop/test' if Spec::Runner::test_unit_defined? vendor/plugins/rspec/lib/spec/runner.rb @@ -9,9 +9,11 @@ module Spec class NoisyBacktraceTweaker < BacktraceTweaker def tweak_backtrace(error) return if error.backtrace.nil? - error.backtrace.each do |line| + tweaked = error.backtrace.collect do |line| clean_up_double_slashes(line) + line end + error.set_backtrace(tweaked) end end @@ -40,17 +42,16 @@ module Spec def tweak_backtrace(error) return if error.backtrace.nil? - error.backtrace.collect! do |line| - clean_up_double_slashes(line) - IGNORE_PATTERNS.each do |ignore| - if line =~ ignore - line = nil - break + tweaked = error.backtrace.collect do |message| + clean_up_double_slashes(message) + kept_lines = message.split("\n").select do |line| + IGNORE_PATTERNS.each do |ignore| + break if line =~ ignore end end - line + kept_lines.empty?? nil : kept_lines.join("\n") end - error.backtrace.compact! + error.set_backtrace(tweaked.select {|line| line}) end end end vendor/plugins/rspec/lib/spec/runner/backtrace_tweaker.rb @@ -1,16 +1,14 @@ module Spec module Runner class ClassAndArgumentsParser - class << self - def parse(s) - if s =~ /([a-zA-Z_]+(?:::[a-zA-Z_]+)*):?(.*)/ - arg = $2 == "" ? nil : $2 - [$1, arg] - else - raise "Couldn't parse #{s.inspect}" - end + def self.parse(s) + if s =~ /([a-zA-Z_]+(?:::[a-zA-Z_]+)*):?(.*)/ + arg = $2 == "" ? nil : $2 + [$1, arg] + else + raise "Couldn't parse #{s.inspect}" end end end end -end \ No newline at end of file +end vendor/plugins/rspec/lib/spec/runner/class_and_arguments_parser.rb @@ -2,26 +2,13 @@ require 'spec/runner/option_parser' module Spec module Runner - # Facade to run specs without having to fork a new ruby process (using `spec ...`) class CommandLine - class << self - # Runs specs. +argv+ is the commandline args as per the spec commandline API, +err+ - # and +out+ are the streams output will be written to. - def run(instance_rspec_options) - # NOTE - this call to init_rspec_options is not spec'd, but neither is any of this - # swapping of $rspec_options. That is all here to enable rspec to run against itself - # and maintain coverage in a single process. Therefore, DO NOT mess with this stuff - # unless you know what you are doing! - init_rspec_options(instance_rspec_options) - orig_rspec_options = rspec_options - begin - $rspec_options = instance_rspec_options - return $rspec_options.run_examples - ensure - ::Spec.run = true - $rspec_options = orig_rspec_options - end - end + def self.run(tmp_options=Spec::Runner.options) + orig_options = Spec::Runner.options + Spec::Runner.use tmp_options + tmp_options.run_examples + ensure + Spec::Runner.use orig_options end end end vendor/plugins/rspec/lib/spec/runner/command_line.rb @@ -15,11 +15,11 @@ module Spec end end - def run + def run(run_options) prepare success = true example_groups.each do |example_group| - success = success & example_group.run + success = success & example_group.run(run_options) end return success ensure vendor/plugins/rspec/lib/spec/runner/example_group_runner.rb @@ -45,7 +45,9 @@ module Spec # been provided a block), or when an ExamplePendingError is raised. # +message+ is the message from the ExamplePendingError, if it exists, or the # default value of "Not Yet Implemented" - def example_pending(example, message) + # +pending_caller+ is the file and line number of the spec which + # has called the pending method + def example_pending(example, message, pending_caller) end # This method is invoked after all of the examples have executed. The next method vendor/plugins/rspec/lib/spec/runner/formatter/base_formatter.rb @@ -14,20 +14,16 @@ module Spec def initialize(options, where) super if where.is_a?(String) + FileUtils.mkdir_p(File.dirname(where)) @output = File.open(where, 'w') - elsif where == STDOUT - @output = Kernel - def @output.flush - STDOUT.flush - end else @output = where end @pending_examples = [] end - def example_pending(example, message) - @pending_examples << [example.__full_description, message] + def example_pending(example, message, pending_caller) + @pending_examples << [example.full_description, message, pending_caller] end def dump_failure(counter, failure) @@ -74,14 +70,15 @@ module Spec @output.puts @output.puts "Pending:" @pending_examples.each do |pending_example| - @output.puts "#{pending_example[0]} (#{pending_example[1]})" + @output.puts "\n#{pending_example[0]} (#{pending_example[1]})" + @output.puts "#{pending_example[2]}\n" end end @output.flush end def close - if IO === @output + if IO === @output && @output != $stdout @output.close end end @@ -112,7 +109,7 @@ module Spec def output_to_tty? begin - @output == Kernel || @output.tty? + @output.tty? || ENV.has_key?("AUTOTEST") rescue NoMethodError false end vendor/plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb @@ -85,7 +85,7 @@ module Spec @output.flush end - def example_pending(example, message) + def example_pending(example, message, pending_caller) @output.puts " <script type=\"text/javascript\">makeYellow('rspec-header');</script>" unless @header_red @output.puts " <script type=\"text/javascript\">makeYellow('example_group_#{example_group_number}');</script>" unless @example_group_red move_progress @@ -154,14 +154,6 @@ module Spec font-size: 80%; } </style> -</head> -<body> -EOF - end - - def report_header - <<-EOF -<div class="rspec-report"> <script type="text/javascript"> // <![CDATA[ #{global_scripts} @@ -170,9 +162,19 @@ EOF <style type="text/css"> #{global_styles} </style> +</head> +<body> +EOF + end + + def report_header + <<-EOF +<div class="rspec-report"> <div id="rspec-header"> - <h1>RSpec Results</h1> + <div id="label"> + <h1>RSpec Results</h1> + </div> <div id="summary"> <p id="totals">&nbsp;</p> @@ -212,7 +214,7 @@ EOF def global_styles <<-EOF #rspec-header { - background: #65C400; color: #fff; + background: #65C400; color: #fff; height: 42px; } .rspec-report h1 { @@ -220,15 +222,16 @@ EOF padding: 10px; font-family: "Lucida Grande", Helvetica, sans-serif; font-size: 1.8em; + float: left; } #summary { margin: 0; padding: 5px 10px; font-family: "Lucida Grande", Helvetica, sans-serif; text-align: right; - position: absolute; top: 0px; right: 0px; + float:right; } #summary p { vendor/plugins/rspec/lib/spec/runner/formatter/html_formatter.rb @@ -16,7 +16,7 @@ module Spec current_nested_example_groups = described_example_group_chain current_nested_example_groups.each_with_index do |nested_example_group, i| unless nested_example_group == previous_nested_example_groups[i] - output.puts "#{' ' * i}#{nested_example_group.description_args}" + output.puts "#{' ' * i}#{nested_example_group.description_args.join}" end end @@ -40,7 +40,7 @@ module Spec output.flush end - def example_pending(example, message) + def example_pending(example, message, pending_caller) super output.puts yellow("#{current_indentation}#{example.description} (PENDING: #{message})") output.flush @@ -52,9 +52,9 @@ module Spec def described_example_group_chain example_group_chain = [] - example_group.send(:execute_in_class_hierarchy) do |parent_example_group| - if parent_example_group.description_args && !parent_example_group.description_args.empty? - example_group_chain << parent_example_group + example_group.__send__(:each_ancestor_example_group_class) do |example_group_class| + unless example_group_class.description_args.empty? + example_group_chain << example_group_class end end example_group_chain vendor/plugins/rspec/lib/spec/runner/formatter/nested_text_formatter.rb @@ -14,9 +14,9 @@ module Spec @output.flush end - def example_pending(example, message) + def example_pending(example, message, pending_caller) super - @output.print yellow('P') + @output.print yellow('*') @output.flush end vendor/plugins/rspec/lib/spec/runner/formatter/progress_bar_formatter.rb @@ -28,7 +28,7 @@ module Spec output.flush end - def example_pending(example, message) + def example_pending(example, message, pending_caller) super output.puts yellow("- #{example.description} (PENDING: #{message})") output.flush vendor/plugins/rspec/lib/spec/runner/formatter/specdoc_formatter.rb @@ -86,6 +86,7 @@ EOF end def scenario_started(story_title, scenario_name) + @previous_type = nil @scenario_failed = false @scenario_text = <<-EOF <dt>Scenario: #{h scenario_name}</dt> @@ -149,10 +150,22 @@ EOF spans = args.map { |arg| "<span class=\"param\">#{arg}</span>" } desc_string = description.step_name arg_regexp = description.arg_regexp + inner = if(type == @previous_type) + "And " + else + "#{type.to_s.capitalize} " + end i = -1 - inner = type.to_s.capitalize + ' ' + desc_string.gsub(arg_regexp) { |param| spans[i+=1] } + inner += desc_string.gsub(arg_regexp) { |param| spans[i+=1] } + @scenario_text += " <li class=\"#{klass}\">#{inner}</li>\n" + if type == :'given scenario' + @previous_type = :given + else + @previous_type = type + end + end end end vendor/plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb @@ -104,7 +104,14 @@ module Spec end def run_ended - @output.puts "#@count scenarios: #@successful_scenario_count succeeded, #{@failed_scenarios.size} failed, #@pending_scenario_count pending" + summary_text = "#@count scenarios: #@successful_scenario_count succeeded, #{@failed_scenarios.size} failed, #@pending_scenario_count pending" + if !@failed_scenarios.empty? + @output.puts red(summary_text) + elsif !@pending_steps.empty? + @output.puts yellow(summary_text) + else + @output.puts green(summary_text) + end unless @pending_steps.empty? @output.puts "\nPending Steps:" @pending_steps.each_with_index do |pending, i| @@ -116,11 +123,10 @@ module Spec @output.print "\nFAILURES:" @failed_scenarios.each_with_index do |failure, i| title, scenario_name, err = failure - @output.print %[ - #{i+1}) #{title} (#{scenario_name}) FAILED - #{err.class}: #{err.message} - #{err.backtrace.join("\n")} -] + @output.print "\n #{i+1}) " + @output.print red("#{title} (#{scenario_name}) FAILED") + @output.print red("\n #{err.class}: #{err.message}") + @output.print "\n #{err.backtrace.join("\n")}\n" end end end vendor/plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb @@ -1,72 +1,74 @@ -begin - require 'rubygems' - require 'heckle' -rescue LoadError ; raise "You must gem install heckle to use --heckle" ; end +unless Spec::Ruby.version.to_f == 1.9 + begin + require 'rubygems' + require 'heckle' + rescue LoadError ; raise "You must gem install heckle to use --heckle" ; end -module Spec - module Runner - # Creates a new Heckler configured to heckle all methods in the classes - # whose name matches +filter+ - class HeckleRunner - def initialize(filter, heckle_class=Heckler) - @filter = filter - @heckle_class = heckle_class - end - - # Runs all the example groups held by +rspec_options+ once for each of the - # methods in the matched classes. - def heckle_with - if @filter =~ /(.*)[#\.](.*)/ - heckle_method($1, $2) - else - heckle_class_or_module(@filter) + module Spec + module Runner + # Creates a new Heckler configured to heckle all methods in the classes + # whose name matches +filter+ + class HeckleRunner + def initialize(filter, heckle_class=Heckler) + @filter = filter + @heckle_class = heckle_class end - end - def heckle_method(class_name, method_name) - verify_constant(class_name) - heckle = @heckle_class.new(class_name, method_name, rspec_options) - heckle.validate - end + # Runs all the example groups held by +rspec_options+ once for each of the + # methods in the matched classes. + def heckle_with + if @filter =~ /(.*)[#\.](.*)/ + heckle_method($1, $2) + else + heckle_class_or_module(@filter) + end + end - def heckle_class_or_module(class_or_module_name) - verify_constant(class_or_module_name) - pattern = /^#{class_or_module_name}/ - classes = [] - ObjectSpace.each_object(Class) do |klass| - classes << klass if klass.name =~ pattern + def heckle_method(class_name, method_name) + verify_constant(class_name) + heckle = @heckle_class.new(class_name, method_name, Spec::Runner.options) + heckle.validate end + + def heckle_class_or_module(class_or_module_name) + verify_constant(class_or_module_name) + pattern = /^#{class_or_module_name}/ + classes = [] + ObjectSpace.each_object(Class) do |klass| + classes << klass if klass.name =~ pattern + end - classes.each do |klass| - klass.instance_methods(false).each do |method_name| - heckle = @heckle_class.new(klass.name, method_name, rspec_options) - heckle.validate + classes.each do |klass| + klass.instance_methods(false).each do |method_name| + heckle = @heckle_class.new(klass.name, method_name, Spec::Runner.options) + heckle.validate + end end end - end - def verify_constant(name) - begin - # This is defined in Heckle - name.to_class - rescue - raise "Heckling failed - \"#{name}\" is not a known class or module" + def verify_constant(name) + begin + # This is defined in Heckle + name.to_class + rescue + raise "Heckling failed - \"#{name}\" is not a known class or module" + end end end - end - #Supports Heckle 1.2 and prior (earlier versions used Heckle::Base) - class Heckler < (Heckle.const_defined?(:Base) ? Heckle::Base : Heckle) - def initialize(klass_name, method_name, rspec_options) - super(klass_name, method_name) - @rspec_options = rspec_options - end + #Supports Heckle 1.2 and prior (earlier versions used Heckle::Base) + class Heckler < (Heckle.const_defined?(:Base) ? Heckle::Base : Heckle) + def initialize(klass_name, method_name, rspec_options) + super(klass_name, method_name) + @rspec_options = rspec_options + end - def tests_pass? - success = @rspec_options.run_examples - success - end + def tests_pass? + success = @rspec_options.run_examples + success + end + end end end -end +end \ No newline at end of file vendor/plugins/rspec/lib/spec/runner/heckle_runner.rb @@ -10,6 +10,10 @@ module Spec parser.parse(args) parser.options end + + def spec_command? + $0.split('/').last == 'spec' + end end attr_reader :options @@ -34,26 +38,27 @@ module Spec "an example name directly, causing RSpec to run just the example", "matching that name"], :specification => ["-s", "--specification [NAME]", "DEPRECATED - use -e instead", "(This will be removed when autotest works with -e)"], - :line => ["-l", "--line LINE_NUMBER", Integer, "Execute behaviout or specification at given line.", - "(does not work for dynamically generated specs)"], + :line => ["-l", "--line LINE_NUMBER", Integer, "Execute example group or example at given line.", + "(does not work for dynamically generated examples)"], :format => ["-f", "--format FORMAT[:WHERE]","Specifies what format to use for output. Specify WHERE to tell", "the formatter where to write the output. All built-in formats", - "expect WHERE to be a file name, and will write to STDOUT if it's", + "expect WHERE to be a file name, and will write to $stdout if it's", "not specified. The --format option may be specified several times", "if you want several outputs", " ", - "Builtin formats for examples: ", - "progress|p : Text progress", - "profile|o : Text progress with profiling of 10 slowest examples", - "specdoc|s : Example doc as text", - "indented|i : Example doc as indented text", + "Builtin formats for code examples:", + "progress|p : Text-based progress bar", + "profile|o : Text-based progress bar with profiling of 10 slowest examples", + "specdoc|s : Code example doc strings", + "nested|n : Code example doc strings with nested groups intented", "html|h : A nice HTML report", "failing_examples|e : Write all failing examples - input for --example", "failing_example_groups|g : Write all failing example groups - input for --example", " ", - "Builtin formats for stories: ", - "plain|p : Plain Text", - "html|h : A nice HTML report", + "Builtin formats for stories:", + "plain|p : Plain Text", + "html|h : A nice HTML report", + "progress|r : Text progress", " ", "FORMAT can also be the name of a custom formatter class", "(in which case you should also specify --require to load it)"], @@ -93,30 +98,31 @@ module Spec self.banner = "Usage: spec (FILE|DIRECTORY|GLOB)+ [options]" self.separator "" - on(*OPTIONS[:pattern]) {|pattern| @options.filename_pattern = pattern} - on(*OPTIONS[:diff]) {|diff| @options.parse_diff(diff)} - on(*OPTIONS[:colour]) {@options.colour = true} - on(*OPTIONS[:example]) {|example| @options.parse_example(example)} - on(*OPTIONS[:specification]) {|example| @options.parse_example(example)} - on(*OPTIONS[:line]) {|line_number| @options.line_number = line_number.to_i} - on(*OPTIONS[:format]) {|format| @options.parse_format(format)} - on(*OPTIONS[:require]) {|requires| invoke_requires(requires)} - on(*OPTIONS[:backtrace]) {@options.backtrace_tweaker = NoisyBacktraceTweaker.new} - on(*OPTIONS[:loadby]) {|loadby| @options.loadby = loadby} - on(*OPTIONS[:reverse]) {@options.reverse = true} - on(*OPTIONS[:timeout]) {|timeout| @options.timeout = timeout.to_f} - on(*OPTIONS[:heckle]) {|heckle| @options.load_heckle_runner(heckle)} - on(*OPTIONS[:dry_run]) {@options.dry_run = true} - on(*OPTIONS[:options_file]) {|options_file| parse_options_file(options_file)} + on(*OPTIONS[:pattern]) {|pattern| @options.filename_pattern = pattern} + on(*OPTIONS[:diff]) {|diff| @options.parse_diff(diff)} + on(*OPTIONS[:colour]) {@options.colour = true} + on(*OPTIONS[:example]) {|example| @options.parse_example(example)} + on(*OPTIONS[:specification]) {|example| @options.parse_example(example)} + on(*OPTIONS[:line]) {|line_number| @options.line_number = line_number.to_i} + on(*OPTIONS[:format]) {|format| @options.parse_format(format)} + on(*OPTIONS[:require]) {|requires| invoke_requires(requires)} + on(*OPTIONS[:backtrace]) {@options.backtrace_tweaker = NoisyBacktraceTweaker.new} + on(*OPTIONS[:loadby]) {|loadby| @options.loadby = loadby} + on(*OPTIONS[:reverse]) {@options.reverse = true} + on(*OPTIONS[:timeout]) {|timeout| @options.timeout = timeout.to_f} + on(*OPTIONS[:heckle]) {|heckle| @options.load_heckle_runner(heckle)} + on(*OPTIONS[:dry_run]) {@options.dry_run = true} + on(*OPTIONS[:options_file]) {|options_file| parse_options_file(options_file)} on(*OPTIONS[:generate_options]) {|options_file|} - on(*OPTIONS[:runner]) {|runner| @options.user_input_for_runner = runner} - on(*OPTIONS[:drb]) {} - on(*OPTIONS[:version]) {parse_version} - on_tail(*OPTIONS[:help]) {parse_help} + on(*OPTIONS[:runner]) {|runner| @options.user_input_for_runner = runner} + on(*OPTIONS[:drb]) {} + on(*OPTIONS[:version]) {parse_version} + on_tail(*OPTIONS[:help]) {parse_help} end - + def order!(argv, &blk) - @argv = argv + @argv = argv.dup + @argv = (@argv.empty? && self.class.spec_command?) ? ['--help'] : @argv @options.argv = @argv.dup return if parse_generate_options return if parse_drb @@ -128,7 +134,7 @@ module Spec @options end - + protected def invoke_requires(requires) requires.split(",").each do |file| @@ -186,7 +192,7 @@ module Spec end def parse_version - @out_stream.puts ::Spec::VERSION::DESCRIPTION + @out_stream.puts ::Spec::VERSION::SUMMARY exit if stdout? end vendor/plugins/rspec/lib/spec/runner/option_parser.rb @@ -8,7 +8,7 @@ module Spec EXAMPLE_FORMATTERS = { # Load these lazily for better speed 'specdoc' => ['spec/runner/formatter/specdoc_formatter', 'Formatter::SpecdocFormatter'], 's' => ['spec/runner/formatter/specdoc_formatter', 'Formatter::SpecdocFormatter'], - 'nested' => ['spec/runner/formatter/nested_text_formatter', 'Formatter::NestedTextFormatter'], + 'nested' => ['spec/runner/formatter/nested_text_formatter', 'Formatter::NestedTextFormatter'], 'n' => ['spec/runner/formatter/nested_text_formatter', 'Formatter::NestedTextFormatter'], 'html' => ['spec/runner/formatter/html_formatter', 'Formatter::HtmlFormatter'], 'h' => ['spec/runner/formatter/html_formatter', 'Formatter::HtmlFormatter'], @@ -24,10 +24,13 @@ module Spec } STORY_FORMATTERS = { - 'plain' => ['spec/runner/formatter/story/plain_text_formatter', 'Formatter::Story::PlainTextFormatter'], - 'p' => ['spec/runner/formatter/story/plain_text_formatter', 'Formatter::Story::PlainTextFormatter'], - 'html' => ['spec/runner/formatter/story/html_formatter', 'Formatter::Story::HtmlFormatter'], - 'h' => ['spec/runner/formatter/story/html_formatter', 'Formatter::Story::HtmlFormatter'] + 'plain' => ['spec/runner/formatter/story/plain_text_formatter', 'Formatter::Story::PlainTextFormatter'], + 'p' => ['spec/runner/formatter/story/plain_text_formatter', 'Formatter::Story::PlainTextFormatter'], + 'html' => ['spec/runner/formatter/story/html_formatter', 'Formatter::Story::HtmlFormatter'], + 'h' => ['spec/runner/formatter/story/html_formatter', 'Formatter::Story::HtmlFormatter'], + 'progress' => ['spec/runner/formatter/story/progress_bar_formatter', 'Formatter::Story::ProgressBarFormatter'], + 'r' => ['spec/runner/formatter/story/progress_bar_formatter', 'Formatter::Story::ProgressBarFormatter'] + } attr_accessor( @@ -37,7 +40,6 @@ module Spec :diff_format, :dry_run, :profile, - :examples, :heckle_runner, :line_number, :loadby, @@ -48,13 +50,11 @@ module Spec :user_input_for_runner, :error_stream, :output_stream, - :before_suite_parts, - :after_suite_parts, # TODO: BT - Figure out a better name :argv ) - attr_reader :colour, :differ_class, :files, :example_groups - + attr_reader :colour, :differ_class, :files, :examples, :example_groups + def initialize(error_stream, output_stream) @error_stream = error_stream @output_stream = output_stream @@ -73,7 +73,6 @@ module Spec @examples_run = false @examples_should_be_run = nil @user_input_for_runner = nil - @before_suite_parts = [] @after_suite_parts = [] end @@ -89,9 +88,6 @@ module Spec return true unless examples_should_be_run? success = true begin - before_suite_parts.each do |part| - part.call - end runner = custom_runner || ExampleGroupRunner.new(self) unless @files_loaded @@ -99,11 +95,20 @@ module Spec @files_loaded = true end + # TODO - this has to happen after the files get loaded, + # otherwise the before_suite_parts are not populated + # from the configuration. There is no spec for this + # directly, but stories/configuration/before_blocks.story + # will fail if this happens before the files are loaded. + before_suite_parts.each do |part| + part.call + end + if example_groups.empty? true else set_spec_from_line_number if line_number - success = runner.run + success = runner.run(self) @examples_run = true heckle if heckle_runner success @@ -114,6 +119,14 @@ module Spec end end end + + def before_suite_parts + Spec::Example::BeforeAndAfterHooks.before_suite_parts + end + + def after_suite_parts + Spec::Example::BeforeAndAfterHooks.after_suite_parts + end def examples_run? @examples_run @@ -121,14 +134,26 @@ module Spec def examples_should_not_be_run @examples_should_be_run = false - end + end + + def predicate_matchers + # TODO - don't like this dependency - perhaps store these in here instead? + Spec::Runner.configuration.predicate_matchers + end + + def mock_framework + # TODO - don't like this dependency - perhaps store this in here instead? + Spec::Runner.configuration.mock_framework + end def colour=(colour) @colour = colour if @colour && RUBY_PLATFORM =~ /mswin|mingw/ ;\ begin ;\ + replace_output = @output_stream.equal?($stdout) ;\ require 'rubygems' ;\ require 'Win32/Console/ANSI' ;\ + @output_stream = $stdout if replace_output ;\ rescue LoadError ;\ warn "You must 'gem install win32console' to use colour on Windows" ;\ @colour = false ;\ @@ -152,7 +177,7 @@ module Spec def parse_example(example) if(File.file?(example)) - @examples = File.open(example).read.split("\n") + @examples = [File.open(example).read.split("\n")].flatten else @examples = [example] end @@ -198,11 +223,8 @@ module Spec end def number_of_examples - total = 0 - @example_groups.each do |example_group| - total += example_group.number_of_examples - end - total + return examples.size unless examples.empty? + @example_groups.inject(0) {|sum, group| sum + group.number_of_examples} end def files_to_load @@ -221,6 +243,10 @@ module Spec result end + def dry_run? + @dry_run == true + end + protected def examples_should_be_run? return @examples_should_be_run unless @examples_should_be_run.nil? @@ -288,7 +314,7 @@ module Spec error_stream.puts "You must specify one file, not a directory when using the --line option" exit(1) if stderr? else - example = SpecParser.new.spec_name_for(files[0], line_number) + example = SpecParser.new(self).spec_name_for(files[0], line_number) @examples = [example] end else vendor/plugins/rspec/lib/spec/runner/options.rb @@ -26,7 +26,7 @@ module Spec if error.nil? example_passed(example) elsif Spec::Example::ExamplePendingError === error - example_pending(example, error.message) + example_pending(example, error.pending_caller, error.message) else example_failed(example, error) end @@ -103,14 +103,34 @@ module Spec def example_passed(example) formatters.each{|f| f.example_passed(example)} end + + EXAMPLE_PENDING_DEPRECATION_WARNING = <<-WARNING + DEPRECATION NOTICE: RSpec's formatters have changed example_pending + to accept three arguments instead of just two. Please see the rdoc + for Spec::Runner::Formatter::BaseFormatter#example_pending + for more information. + + Please update any custom formatters to accept the third argument + to example_pending. Support for example_pending with two arguments + and this warning message will be removed after the RSpec 1.1.5 release. + WARNING - def example_pending(example, message="Not Yet Implemented") + def example_pending(example, pending_caller, message="Not Yet Implemented") @pending_count += 1 - formatters.each do |f| - f.example_pending(example, message) + formatters.each do |formatter| + if formatter_uses_deprecated_example_pending_method?(formatter) + Kernel.warn EXAMPLE_PENDING_DEPRECATION_WARNING + formatter.example_pending(example, message) + else + formatter.example_pending(example, message, pending_caller) + end end end + def formatter_uses_deprecated_example_pending_method?(formatter) + formatter.method(:example_pending).arity == 2 + end + class Failure attr_reader :example, :exception @@ -139,7 +159,7 @@ module Spec protected def example_name - @example.__full_description + @example.full_description end end end vendor/plugins/rspec/lib/spec/runner/reporter.rb @@ -4,15 +4,16 @@ module Spec class SpecParser attr_reader :best_match - def initialize + def initialize(run_options) @best_match = {} + @run_options = run_options end def spec_name_for(file, line_number) best_match.clear file = File.expand_path(file) - rspec_options.example_groups.each do |example_group| - consider_example_groups_for_best_match example_group, file, line_number + @run_options.example_groups.each do |example_group| + consider_example_group_for_best_match example_group, file, line_number example_group.examples.each do |example| consider_example_for_best_match example, example_group, file, line_number @@ -31,8 +32,8 @@ module Spec protected - def consider_example_groups_for_best_match(example_group, file, line_number) - parsed_backtrace = parse_backtrace(example_group.registration_backtrace) + def consider_example_group_for_best_match(example_group, file, line_number) + parsed_backtrace = parse_backtrace(example_group.backtrace) parsed_backtrace.each do |example_file, example_line| if is_best_match?(file, line_number, example_file, example_line) best_match.clear @@ -43,7 +44,7 @@ module Spec end def consider_example_for_best_match(example, example_group, file, line_number) - parsed_backtrace = parse_backtrace(example.implementation_backtrace) + parsed_backtrace = parse_backtrace(example.backtrace) parsed_backtrace.each do |example_file, example_line| if is_best_match?(file, line_number, example_file, example_line) best_match.clear @@ -61,9 +62,10 @@ module Spec end def parse_backtrace(backtrace) - backtrace.collect do |trace_line| - split_line = trace_line.split(':') - [split_line[0], Integer(split_line[1])] + Array(backtrace).collect do |trace_line| + trace_line =~ /(.*)\:(\d*)(\:|$)/ + file, number = $1, $2 + [file, Integer(number)] end end end vendor/plugins/rspec/lib/spec/runner/spec_parser.rb @@ -8,53 +8,50 @@ require 'spec/story/runner/plain_text_story_runner.rb' module Spec module Story module Runner - class << self - def run_options # :nodoc: - rspec_options - # @run_options ||= ::Spec::Runner::OptionParser.parse(ARGV, $stderr, $stdout) - end - - def story_runner # :nodoc: - unless @story_runner - @story_runner = create_story_runner - run_options.story_formatters.each do |formatter| - register_listener(formatter) - end - self.register_exit_hook - end - @story_runner - end - - def scenario_runner # :nodoc: - @scenario_runner ||= ScenarioRunner.new - end - - def world_creator # :nodoc: - @world_creator ||= World - end - - def create_story_runner - StoryRunner.new(scenario_runner, world_creator) - end - - # Use this to register a customer output formatter. - def register_listener(listener) - story_runner.add_listener(listener) # run_started, story_started, story_ended, #run_ended - world_creator.add_listener(listener) # found_scenario, step_succeeded, step_failed, step_failed - scenario_runner.add_listener(listener) # scenario_started, scenario_succeeded, scenario_pending, scenario_failed - end - - def register_exit_hook # :nodoc: - at_exit do - exit Runner.story_runner.run_stories unless $! + def self.run_options # :nodoc: + Spec::Runner.options + end + + def self.story_runner # :nodoc: + unless @story_runner + @story_runner = create_story_runner + run_options.story_formatters.each do |formatter| + register_listener(formatter) end + self.register_exit_hook end - - def dry_run - run_options.dry_run + @story_runner + end + + def self.scenario_runner # :nodoc: + @scenario_runner ||= ScenarioRunner.new + end + + def self.world_creator # :nodoc: + @world_creator ||= World + end + + def self.create_story_runner + Runner::StoryRunner.new(scenario_runner, world_creator) + end + + # Use this to register a customer output formatter. + def self.register_listener(listener) + story_runner.add_listener(listener) # run_started, story_started, story_ended, #run_ended + world_creator.add_listener(listener) # found_scenario, step_succeeded, step_failed, step_failed + scenario_runner.add_listener(listener) # scenario_started, scenario_succeeded, scenario_pending, scenario_failed + end + + def self.register_exit_hook # :nodoc: + at_exit do + exit Runner.story_runner.run_stories unless $! end - end + + def self.dry_run + run_options.dry_run + end + end end end vendor/plugins/rspec/lib/spec/story/runner.rb @@ -2,12 +2,16 @@ module Spec module Story module Runner class StoryRunner - class << self - attr_accessor :current_story_runner - - def scenario_from_current_story(scenario_name) - current_story_runner.scenario_from_current_story(scenario_name) - end + def self.current_story_runner + @current_story_runner + end + + def self.current_story_runner=(current_story_runner) + @current_story_runner = current_story_runner + end + + def self.scenario_from_current_story(scenario_name) + current_story_runner.scenario_from_current_story(scenario_name) end attr_accessor :stories, :scenarios, :current_story vendor/plugins/rspec/lib/spec/story/runner/story_runner.rb @@ -19,11 +19,11 @@ module Spec end def matches?(name) - !(matches = name.match(@expression)).nil? + !(name.strip =~ @expression).nil? end def parse_args(name) - name.match(@expression)[1..-1] + name.strip.match(@expression)[1..-1] end private @@ -60,7 +60,7 @@ module Spec expression = string_or_regexp.source end while expression =~ PARAM_PATTERN - expression.gsub!($2, "(.*?)") + expression.sub!($2, "(.*?)") end @expression = Regexp.new("\\A#{expression}\\Z", Regexp::MULTILINE) end vendor/plugins/rspec/lib/spec/story/step.rb @@ -13,7 +13,8 @@ module Spec @steps.add(type, step) end - def find(type, name) + def find(type, unstripped_name) + name = unstripped_name.strip if @steps.find(type, name).nil? @steps.add(type, Step.new(name) do vendor/plugins/rspec/lib/spec/story/step_mother.rb @@ -15,82 +15,78 @@ module Spec module World include ::Spec::Example::Pending include ::Spec::Matchers - # store steps and listeners in the singleton metaclass. - # This serves both to keep them out of the way of runtime Worlds - # and to make them available to all instances. - class << self - def create(cls = Object, *args) - cls.new(*args).extend(World) - end - - def listeners - @listeners ||= [] - end - - def add_listener(listener) - listeners() << listener - end - - def step_mother - @step_mother ||= StepMother.new - end - - def use(steps) - step_mother.use(steps) - end - - def step_names - @step_names ||= [] - end - def run_given_scenario_with_suspended_listeners(world, type, name, scenario) - current_listeners = Array.new(listeners) - begin - listeners.each { |l| l.found_scenario(type, name) } - @listeners.clear - scenario.perform(world, name) unless dry_run - ensure - @listeners.replace(current_listeners) - end - end - - def store_and_call(world, type, name, *args, &block) - if block_given? - step_mother.store(type, Step.new(name, &block)) - end - step = step_mother.find(type, name) + def self.create(cls = Object, *args) + cls.new(*args).extend(World) + end + + def self.listeners + @listeners ||= [] + end + + def self.add_listener(listener) + listeners() << listener + end + + def self.step_mother + @step_mother ||= StepMother.new + end + + def self.use(steps) + step_mother.use(steps) + end + + def self.step_names + @step_names ||= [] + end - step_name = step.name - step_names << step_name - - # It's important to have access to the parsed args here, so - # we can give them to the listeners. The HTML reporter needs - # the args so it can style them. See the generated output in - # story_server/prototype/rspec_stories.html (generated by rake stories) - args = step.parse_args(name) if args.empty? - begin - listeners.each { |l| l.step_upcoming(type, step_name, *args) } - step.perform(world, *args) unless dry_run - listeners.each { |l| l.step_succeeded(type, step_name, *args) } - rescue Exception => e - case e - when Spec::Example::ExamplePendingError - @listeners.each { |l| l.step_pending(type, step_name, *args) } - else - @listeners.each { |l| l.step_failed(type, step_name, *args) } - end - errors << e - end + def self.run_given_scenario_with_suspended_listeners(world, type, name, scenario) + current_listeners = Array.new(listeners) + begin + listeners.each { |l| l.found_scenario(type, name) } + @listeners.clear + scenario.perform(world, name) unless dry_run + ensure + @listeners.replace(current_listeners) end - - def errors - @errors ||= [] + end + + def self.store_and_call(world, type, name, *args, &block) + if block_given? + step_mother.store(type, Step.new(name, &block)) end + step = step_mother.find(type, name) + + step_name = step.name + step_names << step_name - def dry_run - ::Spec::Story::Runner.dry_run + # It's important to have access to the parsed args here, so + # we can give them to the listeners. The HTML reporter needs + # the args so it can style them. See the generated output in + # story_server/prototype/rspec_stories.html (generated by rake stories) + args = step.parse_args(name) if args.empty? + begin + listeners.each { |l| l.step_upcoming(type, step_name, *args) } + step.perform(world, *args) unless dry_run + listeners.each { |l| l.step_succeeded(type, step_name, *args) } + rescue Exception => e + case e + when Spec::Example::ExamplePendingError + @listeners.each { |l| l.step_pending(type, step_name, *args) } + else + @listeners.each { |l| l.step_failed(type, step_name, *args) } + end + errors << e end - end # end of class << self + end + + def self.errors + @errors ||= [] + end + + def self.dry_run + ::Spec::Story::Runner.dry_run + end def start_collecting_errors errors.clear vendor/plugins/rspec/lib/spec/story/world.rb @@ -1,22 +1,15 @@ -module Spec - module VERSION - unless defined? MAJOR - MAJOR = 1 - MINOR = 1 - TINY = 4 - RELEASE_CANDIDATE = nil - - BUILD_TIME_UTC = 20080628203842 - - STRING = [MAJOR, MINOR, TINY].join('.') - TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_') - FULL_VERSION = "#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('.')} (build #{BUILD_TIME_UTC})" - - NAME = "RSpec" - URL = "http://rspec.rubyforge.org/" - - DESCRIPTION = "#{NAME}-#{FULL_VERSION} - BDD for Ruby\n#{URL}" - end - end -end - +module Spec + module VERSION + unless defined? MAJOR + MAJOR = 1 + MINOR = 1 + TINY = 11 + MINESCULE = 4 + + + STRING = [MAJOR, MINOR, TINY, MINESCULE].join('.') + + SUMMARY = "rspec #{STRING}" + end + end +end \ No newline at end of file vendor/plugins/rspec/lib/spec/version.rb @@ -1,19 +1,8 @@ -require File.dirname(__FILE__) + "/../autotest_helper" +require File.dirname(__FILE__) + "/autotest_helper" -module DiscoveryHelper - def load_discovery +describe Autotest::Rspec, "discovery" do + it "adds the rspec autotest plugin" do + Autotest.should_receive(:add_discovery) require File.dirname(__FILE__) + "/../../lib/autotest/discover" end -end - - -class Autotest - describe Rspec, "discovery" do - include DiscoveryHelper - - it "should add the rspec autotest plugin" do - Autotest.should_receive(:add_discovery).and_yield - load_discovery - end - end -end +end vendor/plugins/rspec/spec/autotest/discover_spec.rb @@ -1,98 +1,8 @@ -require File.dirname(__FILE__) + "/../autotest_helper" +require File.dirname(__FILE__) + "/autotest_helper" class Autotest - module AutotestHelper - def rspec_output - <<-HERE -.............PPF - -1) -'false should be false' FAILED -expected: true, - got: false (using ==) -./spec/autotest/rspec_spec.rb:203: - -Finished in 0.158674 seconds - -16 examples, 1 failure, 2 pending - -Pending: -Autotest::Rspec handling failed results should return an array of failed examples and errors (TODO) -Autotest::Rspec tests/specs for a given file should find all the specs for a given file (TODO) -HERE - end - - def common_setup - @proc = mock Proc - @kernel = mock Kernel - @kernel.stub!(:proc).and_return @proc - - File.stub!(:exists).and_return true - @windows_alt_separator = "\\" - @posix_separator = '/' - - @rspec_output = rspec_output - end - end - describe Rspec do - describe "selection of rspec command" do - include AutotestHelper - - before(:each) do - common_setup - @rspec_autotest = Rspec.new - end - - it "should try to find the spec command if it exists in ./bin and use it above everything else" do - File.stub!(:exists?).and_return true - - spec_path = File.expand_path("#{File.dirname(__FILE__)}/../../bin/spec") - File.should_receive(:exists?).with(spec_path).and_return true - @rspec_autotest.spec_command.should == spec_path - end - - it "should otherwise select the default spec command in gem_dir/bin/spec" do - @rspec_autotest.stub!(:spec_commands).and_return ["/foo/spec"] - Config::CONFIG.stub!(:[]).and_return "/foo" - File.should_receive(:exists?).with("/foo/spec").and_return(true) - - @rspec_autotest.spec_command.should == "/foo/spec" - end - - it "should raise an error if no spec command is found at all" do - File.stub!(:exists?).and_return false - - lambda { - @rspec_autotest.spec_command - }.should raise_error(RspecCommandError, "No spec command could be found!") - end - end - - describe "selection of rspec command (windows compatibility issues)" do - include AutotestHelper - - before(:each) do - common_setup - end - - it "should use the ALT_SEPARATOR if it is non-nil" do - @rspec_autotest = Rspec.new - spec_command = File.expand_path("#{File.dirname(__FILE__)}/../../bin/spec") - @rspec_autotest.stub!(:spec_commands).and_return [spec_command] - @rspec_autotest.spec_command(@windows_alt_separator).should == spec_command.gsub('/', @windows_alt_separator) - end - - it "should not use the ALT_SEPATOR if it is nil" do - @windows_alt_separator = nil - @rspec_autotest = Rspec.new - spec_command = File.expand_path("#{File.dirname(__FILE__)}/../../bin/spec") - @rspec_autotest.stub!(:spec_commands).and_return [spec_command] - @rspec_autotest.spec_command.should == spec_command - end - end - describe "adding spec.opts --options" do before(:each) do @rspec_autotest = Rspec.new @@ -116,7 +26,7 @@ HERE @rspec_autotest.stub!(:add_options_if_present).and_return "-O spec/spec.opts" @ruby = @rspec_autotest.ruby - @spec_command = @rspec_autotest.spec_command + @spec_cmd = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec')) @options = @rspec_autotest.add_options_if_present @files_to_test = { :spec => ["file_one", "file_two"] @@ -126,16 +36,13 @@ HERE @files_to_test.stub!(:keys).and_return @files_to_test[:spec] @to_test = @files_to_test.keys.flatten.join ' ' end - - it "should contain the various commands, ordered by preference" do - Rspec.new.spec_commands.should == [ - File.expand_path("#{File.dirname(__FILE__)}/../../bin/spec"), - "#{Config::CONFIG['bindir']}/spec" - ] - end - it "should make the apropriate test command" do - @rspec_autotest.make_test_cmd(@files_to_test).should == "#{@ruby} -S #{@spec_command} #{@options} #{@to_test}" + it "should make the appropriate test command" do + @rspec_autotest.make_test_cmd(@files_to_test).should == "#{@ruby} #{@spec_cmd} #{@to_test} #{@options}" + end + + it "should return a blank command for no files" do + @rspec_autotest.make_test_cmd({}).should == '' end end @@ -156,16 +63,17 @@ HERE @rspec_autotest.should map_specs([@spec_file]).to(@spec_file) end - it "should only find the file if the file is being tracked (in @file)" do + it "should ignore files in spec dir that aren't specs" do + @rspec_autotest.should map_specs([]).to("spec/spec_helper.rb") + end + + it "should ignore untracked files (in @file)" do @rspec_autotest.should map_specs([]).to("lib/untracked_file") end end describe "consolidating failures" do - include AutotestHelper - before(:each) do - common_setup @rspec_autotest = Rspec.new @spec_file = "spec/autotest/some_spec.rb" vendor/plugins/rspec/spec/autotest/rspec_spec.rb @@ -1,7 +1,6 @@ if __FILE__ == $0 dir = File.dirname(__FILE__) Dir["#{dir}/**/*_spec.rb"].reverse.each do |file| -# puts "require '#{file}'" require file end end vendor/plugins/rspec/spec/rspec_suite.rb @@ -3,37 +3,41 @@ require File.dirname(__FILE__) + '/../../spec_helper' module Spec module Example class ExampleGroupSubclass < ExampleGroup - class << self - attr_accessor :examples_ran + def self.examples_ran + @examples_ran end - @@klass_variable_set = true - CONSTANT = :foobar + def self.examples_ran=(examples_ran) + @examples_ran = examples_ran + end + + @@class_variable = :class_variable + CONSTANT = :constant before do - @instance_variable = :hello + @instance_variable = :instance_variable end - - it "should run" do + + after(:all) do self.class.examples_ran = true end it "should have access to instance variables" do - @instance_variable.should == :hello + @instance_variable.should == :instance_variable end it "should have access to class variables" do - @@klass_variable_set.should == true + @@class_variable.should == :class_variable end it "should have access to constants" do - CONSTANT.should == :foobar + CONSTANT.should == :constant end it "should have access to methods defined in the Example Group" do a_method.should == 22 end - + def a_method 22 end vendor/plugins/rspec/spec/spec/example/example_group_class_definition_spec.rb @@ -5,35 +5,35 @@ module Spec describe ExampleGroupFactory do describe "#get" do attr_reader :example_group - before do - @example_group = Class.new(ExampleGroup) - ExampleGroupFactory.register(:registered_type, @example_group) + before(:each) do + @example_group_class = Class.new(ExampleGroup) + ExampleGroupFactory.register(:registered_type, @example_group_class) end - after do + after(:each) do ExampleGroupFactory.reset end - it "should #get the default ExampleGroup type when passed nil" do + it "should return the default ExampleGroup type for nil" do ExampleGroupFactory.get(nil).should == ExampleGroup end - it "should #get the default ExampleGroup for unregistered non-nil values" do + it "should return the default ExampleGroup for an unregistered non-nil value" do ExampleGroupFactory.get(:does_not_exist).should == ExampleGroup end - it "should #get custom type for :registered_type" do - ExampleGroupFactory.get(:registered_type).should == @example_group + it "should return custom type if registered" do + ExampleGroupFactory.get(:registered_type).should == @example_group_class end - it "should #get the actual type when that is passed in" do - ExampleGroupFactory.get(@example_group).should == @example_group + it "should return the actual type when that is what is submitted" do + ExampleGroupFactory.get(@example_group_class).should == @example_group_class end it "should get the custom type after setting the default" do - @example_group2 = Class.new(ExampleGroup) - ExampleGroupFactory.default(@example_group2) - ExampleGroupFactory.get(:registered_type).should == @example_group + @alternate_example_group_class = Class.new(ExampleGroup) + ExampleGroupFactory.default(@alternate_example_group_class) + ExampleGroupFactory.get(:registered_type).should == @example_group_class end end @@ -57,15 +57,28 @@ module Spec example_group.superclass.should == Spec::Example::ExampleGroup end - describe "when :type => :default" do - it "should create a Spec::Example::Example" do - example_group = Spec::Example::ExampleGroupFactory.create_example_group( - "example_group", :type => :default - ) {} - example_group.superclass.should == Spec::Example::ExampleGroup - end + it "should raise when no description is given" do + lambda { + Spec::Example::ExampleGroupFactory.create_example_group do; end + }.should raise_error(ArgumentError) + end + + it "should raise when no block is given" do + lambda { Spec::Example::ExampleGroupFactory.create_example_group "foo" }.should raise_error(ArgumentError) + end + + it "should run registered ExampleGroups" do + example_group = Spec::Example::ExampleGroupFactory.create_example_group "The ExampleGroup" do end + Spec::Runner.options.example_groups.should include(example_group) + end - it "should create a Spec::Example::Example" do + it "should not run unregistered ExampleGroups" do + example_group = Spec::Example::ExampleGroupFactory.create_example_group "The ExampleGroup" do Spec::Runner.options.remove_example_group self; end + Spec::Runner.options.example_groups.should_not include(example_group) + end + + describe "with :type => :default" do + it "should create a Spec::Example::ExampleGroup" do example_group = Spec::Example::ExampleGroupFactory.create_example_group( "example_group", :type => :default ) {} @@ -73,8 +86,8 @@ module Spec end end - describe "when :type => :something_other_than_default" do - it "should create specified type" do + describe "with :type => :something_other_than_default" do + it "should create the specified type" do Spec::Example::ExampleGroupFactory.register(:something_other_than_default, parent_example_group) non_default_example_group = Spec::Example::ExampleGroupFactory.create_example_group( "example_group", :type => :something_other_than_default @@ -99,18 +112,23 @@ module Spec ) {} custom_example_group.superclass.should == parent_example_group end + + it "sets the spec_path from the caller" do + options = {} + shared_example_group = Spec::Example::ExampleGroupFactory.create_example_group("foo", options) {} + options[:spec_path].should =~ /#{__FILE__}:#{__LINE__ - 1}/ + end - describe "when :shared => true" do - attr_reader :shared_example_group - before do - @shared_example_group = Spec::Example::ExampleGroupFactory.create_example_group( + describe "with :shared => true" do + def shared_example_group + @shared_example_group ||= Spec::Example::ExampleGroupFactory.create_example_group( "name", :spec_path => '/blah/spec/models/blah.rb', :type => :controller, :shared => true ) {} end - it "should create and register a Spec::Example::Example" do + it "should create and register a Spec::Example::SharedExampleGroup" do shared_example_group.should be_an_instance_of(Spec::Example::SharedExampleGroup) - SharedExampleGroup.shared_example_groups.should include(shared_example_group) + SharedExampleGroup.should include(shared_example_group) end end @@ -125,14 +143,57 @@ module Spec it "should register ExampleGroup by default" do example_group = Spec::Example::ExampleGroupFactory.create_example_group("The ExampleGroup") do end - rspec_options.example_groups.should include(example_group) + Spec::Runner.options.example_groups.should include(example_group) end it "should enable unregistering of ExampleGroups" do example_group = Spec::Example::ExampleGroupFactory.create_example_group("The ExampleGroup") do - unregister + Spec::Runner.options.remove_example_group self end - rspec_options.example_groups.should_not include(example_group) + Spec::Runner.options.example_groups.should_not include(example_group) + end + + after(:each) do + Spec::Example::ExampleGroupFactory.reset + end + end + + describe "#create_shared_example_group" do + it "registers a new shared example group" do + shared_example_group = Spec::Example::ExampleGroupFactory.create_shared_example_group("something shared") {} + shared_example_group.should be_an_instance_of(Spec::Example::SharedExampleGroup) + SharedExampleGroup.should include(shared_example_group) + end + + it "sets the spec_path from the caller" do + options = {} + shared_example_group = Spec::Example::ExampleGroupFactory.create_shared_example_group("foo", options) {} + options[:spec_path].should =~ /#{__FILE__}:#{__LINE__ - 1}/ + end + end + + describe "#registered_or_ancestor_of_registered?" do + before(:each) do + @unregistered_parent = Class.new(ExampleGroup) + @registered_child = Class.new(@unregistered_parent) + @unregistered_grandchild = Class.new(@registered_child) + Spec::Example::ExampleGroupFactory.register :registered_child, @registered_child + end + + it "should return true for empty list" do + Spec::Example::ExampleGroupFactory.registered_or_ancestor_of_registered?([]).should be_true + end + + it "should return true for a registered example group class" do + Spec::Example::ExampleGroupFactory.registered_or_ancestor_of_registered?([@registered_child]).should be_true + end + + it "should return true for an ancestor of a registered example_group_classes" do + Spec::Example::ExampleGroupFactory.registered_or_ancestor_of_registered?([@unregistered_parent]).should be_true + end + + it "should return false for a subclass of a registered example_group_class" do + Spec::Example::ExampleGroupFactory.registered_or_ancestor_of_registered?([@unregistered_grandchild]).should be_false end after(:each) do vendor/plugins/rspec/spec/spec/example/example_group_factory_spec.rb @@ -3,570 +3,632 @@ require File.dirname(__FILE__) + '/../../spec_helper' module Spec module Example describe 'ExampleGroupMethods' do - it_should_behave_like "sandboxed rspec_options" - attr_reader :example_group, :result, :reporter - before(:each) do - options.formatters << mock("formatter", :null_object => true) - options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true) - @reporter = FakeReporter.new(@options) - options.reporter = reporter - @example_group = Class.new(ExampleGroup) do - describe("ExampleGroup") - it "does nothing" + with_sandboxed_options do + attr_reader :example_group, :result, :reporter + before(:each) do + # See http://rspec.lighthouseapp.com/projects/5645-rspec/tickets/525-arity-changed-on-partial-mocks#ticket-525-2 + method_with_three_args = lambda { |arg1, arg2, arg3| } + options.formatters << mock("formatter", :null_object => true, :example_pending => method_with_three_args) + options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true) + @reporter = FakeReporter.new(@options) + options.reporter = reporter + @example_group = Class.new(ExampleGroup) do + describe("ExampleGroup") + it "does nothing" + end end - class << example_group - public :include + + after(:each) do + ExampleGroup.reset end - @result = nil - end - after(:each) do - ExampleGroup.reset - end - - ["describe","context"].each do |method| - describe "#{method}" do - describe "when creating an ExampleGroup" do - attr_reader :child_example_group - before do - @child_example_group = @example_group.send method, "Another ExampleGroup" do - it "should pass" do - true.should be_true + ["describe","context"].each do |method| + describe "##{method}" do + describe "when creating an ExampleGroup" do + before(:each) do + @parent_example_group = Class.new(ExampleGroup) do + example "first example" do; end + end + @child_example_group = @parent_example_group.__send__ method, "Child" do + example "second example" do; end end end - end - it "should create a subclass of the ExampleGroup when passed a block" do - child_example_group.superclass.should == @example_group - @options.example_groups.should include(child_example_group) - end + it "should create a subclass of the ExampleGroup when passed a block" do + @child_example_group.superclass.should == @parent_example_group + options.example_groups.should include(@child_example_group) + end - it "should not inherit examples" do - child_example_group.examples.length.should == 1 + it "should not inherit examples" do + @child_example_group.should have(1).examples + end + + it "records the spec path" do + @child_example_group.spec_path.should =~ /#{__FILE__}:#{__LINE__ - 15}/ + end end - end - describe "when creating a SharedExampleGroup" do - attr_reader :name, :shared_example_group - before do - @name = "A Shared ExampleGroup" - @shared_example_group = @example_group.send method, name, :shared => true do - it "should pass" do - true.should be_true - end + describe "when creating a SharedExampleGroup" do + before(:each) do + @shared_example_group = @example_group.__send__ method, "A Shared ExampleGroup", :shared => true do; end end - end - after do - SharedExampleGroup.shared_example_groups.delete_if do |registered_shared_example_group| - registered_shared_example_group == shared_example_group + after(:each) do + SharedExampleGroup.instance_eval{@shared_example_groups}.delete @shared_example_group end - end - it "should create a SharedExampleGroup" do - SharedExampleGroup.find_shared_example_group(name).should == shared_example_group + it "should create a SharedExampleGroup" do + @shared_example_group.should_not be_nil + SharedExampleGroup.find("A Shared ExampleGroup").should == @shared_example_group + end end - end + end end - end - - describe "#it" do - it "should should create an example instance" do - lambda { - @example_group.it("") - }.should change { @example_group.examples.length }.by(1) - end - end - - describe "#xit and #xspecify" do - before(:each) do - Kernel.stub!(:warn) + + [:specify, :it].each do |method| + describe "##{method.to_s}" do + it "should should create an example" do + lambda { + @example_group.__send__(method, "") + }.should change { @example_group.examples.length }.by(1) + end + end end + + [:xit, :xspecify].each do |method| + describe "##{method.to_s}" do + before(:each) do + Kernel.stub!(:warn) + end - it "should NOT create an example instance" do - lambda { - @example_group.xit("") - }.should_not change(@example_group.examples, :length) - - lambda { - @example_group.xspecify("") - }.should_not change(@example_group.examples, :length) - end + it "should NOT create an example" do + lambda { + @example_group.__send__(method,"") + }.should_not change(@example_group.examples, :length) + end - it "should warn that it is disabled" do - Kernel.should_receive(:warn).with("Example disabled: foo").twice - @example_group.xit("foo") - @example_group.xspecify("foo") + it "should warn that the example is disabled" do + Kernel.should_receive(:warn).with("Example disabled: foo") + @example_group.__send__(method,"foo") + end + end end - end + - describe "#examples" do - it "should have Examples" do - example_group = Class.new(ExampleGroup) do - describe('example') - it "should pass" do - 1.should == 1 + describe "#examples" do + it "should have Examples" do + example_group = Class.new(ExampleGroup) do + it "should exist" do; end end + example_group.examples.length.should == 1 + example_group.examples.first.description.should == "should exist" end - example_group.examples.length.should == 1 - example_group.examples.first.description.should == "should pass" - end - it "should not include methods that begin with test (only when TU interop is loaded)" do - example_group = Class.new(ExampleGroup) do - describe('example') - def test_any_args(*args) - true.should be_true + it "should not include methods that begin with test (only when TU interop is loaded)" do + example_group = Class.new(ExampleGroup) do + def test_any_args(*args) + true.should be_true + end + def test_something + 1.should == 1 + end + def test + raise "This is not a real test" + end + def testify + raise "This is not a real test" + end + def should_something + # forces the run + end end - def test_something - 1.should == 1 + example_group.examples.length.should == 1 + example_group.run(options).should be_true + end + + it "should include methods that begin with should and has an arity of 0 in suite" do + example_group = Class.new(ExampleGroup) do + def shouldCamelCase + true.should be_true + end + def should_any_args(*args) + true.should be_true + end + def should_something + 1.should == 1 + end + def should_not_something + 1.should_not == 2 + end + def should + raise "This is not a real example" + end + def should_not + raise "This is not a real example" + end end - def test - raise "This is not a real test" + example_group.should have(4).examples + descriptions = example_group.examples.collect {|example| example.description.to_s} + descriptions.should include( + "shouldCamelCase", + "should_any_args", + "should_something", + "should_not_something") + descriptions.should_not include( + "should", + "should_not" + ) + end + + it "should not include methods that begin with test_ and has an arity > 0 in suite" do + example_group = Class.new(ExampleGroup) do + def test_invalid(foo) + 1.should == 1 + end + def testInvalidCamelCase(foo) + 1.should == 1 + end end - def testify - raise "This is not a real test" + example_group.should have(:no).examples + end + + it "should not include methods that begin with should_ and has an arity > 0 in suite" do + example_group = Class.new(ExampleGroup) do + def should_invalid(foo) + 1.should == 2 + end + def shouldInvalidCamelCase(foo) + 1.should == 3 + end + def should_not_invalid(foo) + 1.should == 4 + end + def should_valid + 1.should == 1 + end end - def should_something - # forces the run + example_group.should have(1).examples + example_group.run(options).should be_true + end + + it "should run should_methods" do + example_group = Class.new(ExampleGroup) do + def should_valid + 1.should == 2 + end end + example_group.should have(1).examples + example_group.run(options).should be_false end - example_group.examples.length.should == 1 - example_group.run.should be_true end - it "should include methods that begin with should and has an arity of 0 in suite" do - example_group = Class.new(ExampleGroup) do - describe('example') - def shouldCamelCase - true.should be_true + describe "#set_description" do + attr_reader :example_group + before do + class << example_group + public :set_description + end + end + + describe "given a String" do + before(:each) do + example_group.set_description("abc") end - def should_any_args(*args) - true.should be_true + + specify ".description should return the String passed into .set_description" do + example_group.description.should == "abc" end - def should_something - 1.should == 1 + + specify ".described_type should provide nil as its type" do + example_group.described_type.should be_nil end - def should_not_something - 1.should_not == 2 + end + + describe "given a Class" do + before(:each) do + example_group.set_description(ExampleGroup) end - def should - raise "This is not a real example" + + specify ".description should return a String representation of that type (fully qualified) as its name" do + example_group.description.should == "Spec::Example::ExampleGroup" end - def should_not - raise "This is not a real example" + + specify ".described_type should return the passed in type" do + example_group.described_type.should == Spec::Example::ExampleGroup end end - example_group = example_group.dup - example_group.examples.length.should == 4 - descriptions = example_group.examples.collect {|example| example.description}.sort - descriptions.should include("shouldCamelCase") - descriptions.should include("should_any_args") - descriptions.should include("should_something") - descriptions.should include("should_not_something") - end - it "should not include methods that begin with test_ and has an arity > 0 in suite" do - example_group = Class.new(ExampleGroup) do - describe('example') - def test_invalid(foo) - 1.should == 1 + describe "given a String and a Class" do + before(:each) do + example_group.set_description("behaving", ExampleGroup) end - def testInvalidCamelCase(foo) - 1.should == 1 + + specify ".description should return String then space then Type" do + example_group.description.should == "behaving Spec::Example::ExampleGroup" + end + + specify ".described_type should return the passed in type" do + example_group.described_type.should == Spec::Example::ExampleGroup end end - example_group.examples.length.should == 0 - end - it "should not include methods that begin with should_ and has an arity > 0 in suite" do - example_group = Class.new(ExampleGroup) do - describe('example') - def should_invalid(foo) - 1.should == 2 + describe "given a Class and a String (starting with an alpha char)" do + before(:each) do + example_group.set_description(ExampleGroup, "behaving") end - def shouldInvalidCamelCase(foo) - 1.should == 3 + + specify ".description should return the Type then space then String" do + example_group.description.should == "Spec::Example::ExampleGroup behaving" end - def should_not_invalid(foo) - 1.should == 4 + end + + describe "given a Class and a String (starting with a '.')" do + before(:each) do + example_group.set_description(ExampleGroup, ".behaving") end - def should_valid - 1.should == 1 + + specify ".description should return the Type then String" do + example_group.description.should == "Spec::Example::ExampleGroup.behaving" end end - example_group.examples.length.should == 1 - example_group.run.should be_true - end - it "should run should_methods" do - example_group = Class.new(ExampleGroup) do - def should_valid - 1.should == 2 + describe "#set_description(Class, String starting with #)" do + before(:each) do + example_group.set_description(ExampleGroup, "#behaving") end - end - example_group.examples.length.should == 1 - example_group.run.should be_false - end - end - describe "#set_description" do - attr_reader :example_group - before do - class << example_group - public :set_description + specify "should return the Class then String" do + example_group.description.should == "Spec::Example::ExampleGroup#behaving" + end end - end - describe "#set_description(String)" do - before(:each) do - example_group.set_description("abc") - end + describe "#set_description(Class, String containing .)" do + before(:each) do + example_group.set_description(ExampleGroup, "calling a.b") + end - specify ".description should return the String passed into .set_description" do - example_group.description.should == "abc" + specify ".description should return the Type then space then String" do + example_group.description.should == "Spec::Example::ExampleGroup calling a.b" + end end - specify ".described_type should provide nil as its type" do - example_group.described_type.should be_nil - end - end + describe "#set_description(Class, String containing #)" do + before(:each) do + example_group.set_description(ExampleGroup, "is #1") + end - describe "#set_description(Type)" do - before(:each) do - example_group.set_description(ExampleGroup) + specify ".description should return the Type then space then String" do + example_group.description.should == "Spec::Example::ExampleGroup is #1" + end end - specify ".description should return a String representation of that type (fully qualified) as its name" do - example_group.description.should == "Spec::Example::ExampleGroup" - end + describe "#set_description(String, Type, String)" do + before(:each) do + example_group.set_description("A", Hash, "with one entry") + end - specify ".described_type should return the passed in type" do - example_group.described_type.should == Spec::Example::ExampleGroup + specify ".description should return the first String then space then Type then second String" do + example_group.description.should == "A Hash with one entry" + end end - end - describe "#set_description(String, Type)" do - before(:each) do - example_group.set_description("behaving", ExampleGroup) - end + describe "#set_description(Hash representing options)" do + before(:each) do + example_group.set_description(:a => "b", :spec_path => "blah") + end - specify ".description should return String then space then Type" do - example_group.description.should == "behaving Spec::Example::ExampleGroup" - end + it ".spec_path should expand the passed in :spec_path option passed into the constructor" do + example_group.spec_path.should == File.expand_path("blah") + end + + it ".description_options should return all the options passed in" do + example_group.description_options.should == {:a => "b", :spec_path => "blah"} + end - specify ".described_type should return the passed in type" do - example_group.described_type.should == Spec::Example::ExampleGroup end end - describe "#set_description(Type, String not starting with a space)" do - before(:each) do - example_group.set_description(ExampleGroup, "behaving") + describe "#description" do + it "should return the same description instance for each call" do + example_group.description.should eql(example_group.description) end - specify ".description should return the Type then space then String" do - example_group.description.should == "Spec::Example::ExampleGroup behaving" + it "should not add a space when description_text begins with #" do + child_example_group = Class.new(example_group) do + describe("#foobar", "Does something") + end + child_example_group.description.should == "ExampleGroup#foobar Does something" end - end - describe "#set_description(Type, String starting with .)" do - before(:each) do - example_group.set_description(ExampleGroup, ".behaving") + it "should not add a space when description_text begins with ." do + child_example_group = Class.new(example_group) do + describe(".foobar", "Does something") + end + child_example_group.description.should == "ExampleGroup.foobar Does something" end - - specify ".description should return the Type then String" do - example_group.description.should == "Spec::Example::ExampleGroup.behaving" + + it "should return the class name if nil" do + example_group.set_description(nil) + example_group.description.should =~ /Class:/ + end + + it "should return the class name if nil" do + example_group.set_description("") + example_group.description.should =~ /Class:/ end end - describe "#set_description(Type, String containing .)" do - before(:each) do - example_group.set_description(ExampleGroup, "calling a.b") + describe "#description_parts" do + it "should return an Array of the current class description args" do + example_group.description_parts.should == [example_group.description] end - specify ".description should return the Type then space then String" do - example_group.description.should == "Spec::Example::ExampleGroup calling a.b" - end - end + it "should return an Array of the description args from each class in the hierarchy" do + parent_example_group = Class.new(ExampleGroup) do + describe("Parent") + end + + child_example_group = Class.new(parent_example_group) + child_example_group.describe("Child", ExampleGroup) + child_example_group.description.should_not be_empty - describe "#set_description(Type, String starting with .)" do - before(:each) do - example_group.set_description(ExampleGroup, ".behaving") - end + grand_child_example_group = Class.new(child_example_group) + grand_child_example_group.describe("GrandChild", ExampleGroup) + grand_child_example_group.description.should_not be_empty - specify "should return the Type then String" do - example_group.description.should == "Spec::Example::ExampleGroup.behaving" + grand_child_example_group.description_parts.should == [ + "Parent", + "Child", + Spec::Example::ExampleGroup, + "GrandChild", + Spec::Example::ExampleGroup + ] end end - describe "#set_description(Type, String containing .)" do - before(:each) do - example_group.set_description(ExampleGroup, "is #1") + describe "#described_type" do + it "should return passed in type" do + child_example_group = Class.new(example_group) do + describe Object + end + child_example_group.described_type.should == Object end - specify ".description should return the Type then space then String" do - example_group.description.should == "Spec::Example::ExampleGroup is #1" + it "should return #described_type of superclass when no passed in type" do + parent_example_group = Class.new(ExampleGroup) do + describe Object, "#foobar" + end + child_example_group = Class.new(parent_example_group) do + describe "not a type" + end + child_example_group.described_type.should == Object end end - describe "#set_description(String, Type, String)" do - before(:each) do - example_group.set_description("A", Hash, "with one entry") - end + describe "#remove_after" do + it "should unregister a given after(:each) block" do + after_all_ran = false + proc = Proc.new { after_all_ran = true } - specify ".description should return the first String then space then Type then second String" do - example_group.description.should == "A Hash with one entry" - end - end + example_group = Class.new(ExampleGroup) do + specify("example") {} + after(:each, &proc) + end - describe "#set_description(Hash representing options)" do - before(:each) do - example_group.set_description(:a => "b", :spec_path => "blah") - end + example_group.run(options) + after_all_ran.should be_true - it ".spec_path should expand the passed in :spec_path option passed into the constructor" do - example_group.spec_path.should == File.expand_path("blah") + after_all_ran = false + example_group.remove_after(:each, &proc) + example_group.run(options) + after_all_ran.should be_false end + end - it ".description_options should return all the options passed in" do - example_group.description_options.should == {:a => "b", :spec_path => "blah"} - end + describe "#include" do + it "should have accessible class methods from included module" do + mod_method_called = false + mod = Module.new do + class_methods = Module.new do + define_method :mod_method do + mod_method_called = true + end + end - end - end + self.class.class_eval do + define_method(:included) do |receiver| + receiver.extend class_methods + end + end + end - describe "#description" do - it "should return the same description instance for each call" do - example_group.description.should eql(example_group.description) - end + @example_group.__send__ :include, mod - it "should not add a space when description_text begins with #" do - child_example_group = Class.new(example_group) do - describe("#foobar", "Does something") + @example_group.mod_method + mod_method_called.should be_true end - child_example_group.description.should == "ExampleGroup#foobar Does something" end - it "should not add a space when description_text begins with ." do - child_example_group = Class.new(example_group) do - describe(".foobar", "Does something") + describe "#number_of_examples" do + it "should count number of examples" do + proc do + @example_group.it("one") {} + @example_group.it("two") {} + @example_group.it("three") {} + @example_group.it("four") {} + end.should change {@example_group.number_of_examples}.by(4) end - child_example_group.description.should == "ExampleGroup.foobar Does something" - end - - it "should return the class name if nil" do - example_group.set_description(nil) - example_group.description.should =~ /Class:/ - end - - it "should return the class name if nil" do - example_group.set_description("") - example_group.description.should =~ /Class:/ - end - end - - describe "#description_parts" do - it "should return an Array of the current class description args" do - example_group.description_parts.should == [example_group.description] end - it "should return an Array of the description args from each class in the hierarchy" do - child_example_group = Class.new(example_group) - child_example_group.describe("Child", ExampleGroup) - child_example_group.description.should_not be_empty - - grand_child_example_group = Class.new(child_example_group) - grand_child_example_group.describe("GrandChild", ExampleGroup) - grand_child_example_group.description.should_not be_empty - - grand_child_example_group.description_parts.should == [ - "ExampleGroup", - "Child", - Spec::Example::ExampleGroup, - "GrandChild", - Spec::Example::ExampleGroup - ] - end - end - - describe "#described_type" do - it "should return passed in type" do - child_example_group = Class.new(example_group) do - describe Object + describe "#class_eval" do + it "should allow constants to be defined" do + example_group = Class.new(ExampleGroup) do + FOO = 1 + it "should reference FOO" do + FOO.should == 1 + end + end + success = example_group.run(options) + success.should be_true + Object.const_defined?(:FOO).should == false end - child_example_group.described_type.should == Object end - it "should return #described_type of superclass when no passed in type" do - parent_example_group = Class.new(ExampleGroup) do - describe Object, "#foobar" + describe '#register' do + after(:each) do + Spec::Runner.options.remove_example_group example_group end - child_example_group = Class.new(parent_example_group) do - describe "not a type" + it "should add ExampleGroup to set of ExampleGroups to be run" do + Spec::Runner.options.add_example_group example_group + options.example_groups.should include(example_group) end - child_example_group.described_type.should == Object end - end - describe "#remove_after" do - it "should unregister a given after(:each) block" do - after_all_ran = false - @example_group.it("example") {} - proc = Proc.new { after_all_ran = true } - ExampleGroup.after(:each, &proc) - @example_group.run - after_all_ran.should be_true - - after_all_ran = false - ExampleGroup.remove_after(:each, &proc) - @example_group.run - after_all_ran.should be_false + describe '#unregister' do + before(:each) do + Spec::Runner.options.add_example_group example_group + end + it "should remove ExampleGroup from set of ExampleGroups to be run" do + Spec::Runner.options.remove_example_group example_group + options.example_groups.should_not include(example_group) + end end - end - - describe "#include" do - it "should have accessible class methods from included module" do - mod1_method_called = false - mod1 = Module.new do - extend Spec::MetaClass - class_methods = Module.new do - define_method :mod1_method do - mod1_method_called = true + + describe "#run" do + describe "given an example group with at least one example" do + it "should call add_example_group" do + example_group = Class.new(ExampleGroup) do + example("anything") {} end + reporter.should_receive(:add_example_group) + example_group.run(options) end + end - metaclass.class_eval do - define_method(:included) do |receiver| - receiver.extend class_methods - end + describe "given an example group with no examples" do + it "should NOT call add_example_group" do + example_group = Class.new(ExampleGroup) do end + reporter.should_not_receive(:add_example_group) + example_group.run(options) end end + end - mod2_method_called = false - mod2 = Module.new do - extend Spec::MetaClass - class_methods = Module.new do - define_method :mod2_method do - mod2_method_called = true + describe "#matcher_class=" do + it "should call new and matches? on the class used for matching examples" do + example_group = Class.new(ExampleGroup) do + it "should do something" do end + def self.specified_examples + ["something"] end - end - - metaclass.class_eval do - define_method(:included) do |receiver| - receiver.extend class_methods + def self.to_s + "TestMatcher" end end - end - - @example_group.include mod1, mod2 - @example_group.mod1_method - @example_group.mod2_method - mod1_method_called.should be_true - mod2_method_called.should be_true - end - end + matcher = mock("matcher") + matcher.should_receive(:matches?).with(["something"]).any_number_of_times + + matcher_class = Class.new + matcher_class.should_receive(:new).with("TestMatcher", "should do something").and_return(matcher) - describe "#number_of_examples" do - it "should count number of specs" do - proc do - @example_group.it("one") {} - @example_group.it("two") {} - @example_group.it("three") {} - @example_group.it("four") {} - end.should change {@example_group.number_of_examples}.by(4) - end - end + begin + ExampleGroupMethods.matcher_class = matcher_class - describe "#class_eval" do - it "should allow constants to be defined" do - example_group = Class.new(ExampleGroup) do - describe('example') - FOO = 1 - it "should reference FOO" do - FOO.should == 1 + example_group.run(options) + ensure + ExampleGroupMethods.matcher_class = ExampleMatcher end end - example_group.run - Object.const_defined?(:FOO).should == false end - end - describe '#register' do - it "should add ExampleGroup to set of ExampleGroups to be run" do - options.example_groups.delete(example_group) - options.example_groups.should_not include(example_group) - - example_group.register {} - options.example_groups.should include(example_group) + describe "#options" do + it "should expose the options hash" do + group = describe("group", :this => 'hash') {} + group.options[:this].should == 'hash' + end end - end - describe '#unregister' do - before do - options.example_groups.should include(example_group) + describe "#backtrace" do + it "returns the backtrace from where the example group was defined" do + example_group = Class.new(ExampleGroup).describe("foo") do + example "bar" do; end + end + example_group.backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-3}") + end end - it "should remove ExampleGroup from set of ExampleGroups to be run" do - example_group.unregister - options.example_groups.should_not include(example_group) - end - end + describe "#example_group_backtrace (deprecated)" do + before(:each) do + Kernel.stub!(:warn) + end + it "sends a deprecation warning" do + example_group = Class.new(ExampleGroup) {} + Kernel.should_receive(:warn).with(/#example_group_backtrace.*deprecated.*#backtrace instead/m) + example_group.example_group_backtrace + end - describe "#registration_backtrace" do - it "returns the backtrace of where the ExampleGroup was registered" do - example_group = Class.new(ExampleGroup) - example_group.registration_backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-1}") - end - end - - describe "#run" do - it "should add_example_group if there are any examples to run" do - example_group = Class.new(ExampleGroup) do - it "should do something" do end + it "returns the backtrace from where the example group was defined" do + example_group = Class.new(ExampleGroup).describe("foo") do + example "bar" do; end + end + example_group.example_group_backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-3}") end - reporter.should_receive(:add_example_group) - example_group.run end + + describe "#before" do + it "stores before(:each) blocks" do + example_group = Class.new(ExampleGroup) {} + block = lambda {} + example_group.before(:each, &block) + example_group.before_each_parts.should include(block) + end - it "should NOT add_example_group if there are no examples to run" do - example_group = Class.new(ExampleGroup) do end - reporter.should_not_receive(:add_example_group) - example_group.run - end - end + it "stores before(:all) blocks" do + example_group = Class.new(ExampleGroup) {} + block = lambda {} + example_group.before(:all, &block) + example_group.before_all_parts.should include(block) + end - describe "#matcher_class=" do - it "should call new and matches? on the class used for matching examples" do - example_group = Class.new(ExampleGroup) do - it "should do something" do end - class << self - def specified_examples - ["something"] - end - def to_s - "TestMatcher" - end - end + it "stores before(:suite) blocks" do + example_group = Class.new(ExampleGroup) {} + parts = [] + ExampleGroupMethods.stub!(:before_suite_parts).and_return(parts) + block = lambda {} + example_group.before(:suite, &block) + example_group.before_suite_parts.should include(block) end + end - matcher = mock("matcher") - matcher.should_receive(:matches?).with(["something"]).any_number_of_times - - matcher_class = Class.new - matcher_class.should_receive(:new).with("TestMatcher", "should do something").twice.and_return(matcher) + + describe "#after" do + it "stores after(:each) blocks" do + example_group = Class.new(ExampleGroup) {} + block = lambda {} + example_group.after(:each, &block) + example_group.after_each_parts.should include(block) + end - begin - ExampleGroupMethods.matcher_class = matcher_class + it "stores after(:all) blocks" do + example_group = Class.new(ExampleGroup) {} + block = lambda {} + example_group.after(:all, &block) + example_group.after_all_parts.should include(block) + end - example_group.run - ensure - ExampleGroupMethods.matcher_class = ExampleMatcher + it "stores after(:suite) blocks" do + example_group = Class.new(ExampleGroup) {} + parts = [] + ExampleGroupMethods.stub!(:after_suite_parts).and_return(parts) + block = lambda {} + example_group.after(:suite, &block) + example_group.after_suite_parts.should include(block) end end + end end end -end +end \ No newline at end of file vendor/plugins/rspec/spec/spec/example/example_group_methods_spec.rb @@ -60,589 +60,589 @@ module Spec describe ExampleGroup, "#run with failure in example", :shared => true do it "should add an example failure to the TestResult" do - example_group.run.should be_false + example_group.run(options).should be_false end end describe ExampleGroup, "#run" do - it_should_behave_like "sandboxed rspec_options" - attr_reader :example_group, :formatter, :reporter - before :each do - @formatter = mock("formatter", :null_object => true) - options.formatters << formatter - options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true) - @reporter = FakeReporter.new(options) - options.reporter = reporter - @example_group = Class.new(ExampleGroup) do - describe("example") - it "does nothing" do + with_sandboxed_options do + attr_reader :example_group, :formatter, :reporter + before :each do + method_with_three_args = lambda { |arg1, arg2, arg3| } + @formatter = mock("formatter", :null_object => true, :example_pending => method_with_three_args) + options.formatters << formatter + options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true) + @reporter = FakeReporter.new(options) + options.reporter = reporter + @example_group = Class.new(ExampleGroup) do + describe("example") + it "does nothing" do + end + end + class << example_group + public :include end end - class << example_group - public :include + + after :each do + ExampleGroup.reset end - end - after :each do - ExampleGroup.reset - end + it "should not run when there are no examples" do + example_group = Class.new(ExampleGroup) do + describe("Foobar") + end + example_group.examples.should be_empty - it "should not run when there are no examples" do - example_group = Class.new(ExampleGroup) do - describe("Foobar") + reporter = mock("Reporter") + reporter.should_not_receive(:add_example_group) + example_group.run(options) end - example_group.examples.should be_empty - - reporter = mock("Reporter") - reporter.should_not_receive(:add_example_group) - example_group.run - end - describe "when before_each fails" do - before(:each) do - $example_ran = $after_each_ran = false - @example_group = describe("Foobar") do - before(:each) {raise} - it "should not be run" do - $example_ran = true - end - after(:each) do - $after_each_ran = true + describe "when before_each fails" do + before(:each) do + $example_ran = $after_each_ran = false + @example_group = describe("Foobar") do + before(:each) {raise} + it "should not be run" do + $example_ran = true + end + after(:each) do + $after_each_ran = true + end end end - end - it "should not run example block" do - example_group.run - $example_ran.should be_false - end + it "should not run example block" do + example_group.run(options) + $example_ran.should be_false + end - it "should run after_each" do - example_group.run - $after_each_ran.should be_true - end - - it "should report failure location when in before_each" do - reporter.should_receive(:example_finished) do |example_group, error| - error.message.should eql("in before_each") + it "should run after_each" do + example_group.run(options) + $after_each_ran.should be_true end - example_group.run - end - end - - describe ExampleGroup, "#run on dry run" do - before do - @options.dry_run = true - end - - it "should not run before(:all) or after(:all)" do - before_all_ran = false - after_all_ran = false - ExampleGroup.before(:all) { before_all_ran = true } - ExampleGroup.after(:all) { after_all_ran = true } - example_group.it("should") {} - example_group.run - before_all_ran.should be_false - after_all_ran.should be_false - end - it "should not run example" do - example_ran = false - example_group.it("should") {example_ran = true} - example_group.run - example_ran.should be_false - end - end - - describe ExampleGroup, "#run with specified examples" do - attr_reader :examples_that_were_run - before do - @examples_that_were_run = [] + it "should report failure location when in before_each" do + reporter.should_receive(:example_finished) do |example_group, error| + error.message.should eql("in before_each") + end + example_group.run(options) + end end - describe "when specified_examples matches entire ExampleGroup" do + describe ExampleGroup, "#run on dry run" do before do - examples_that_were_run = @examples_that_were_run - @example_group = Class.new(ExampleGroup) do - describe("the ExampleGroup") - it("should be run") do - examples_that_were_run << 'should be run' - end + @options.dry_run = true + end - it("should also be run") do - examples_that_were_run << 'should also be run' - end - end - options.examples = ["the ExampleGroup"] + it "should not run before(:all) or after(:all)" do + before_all_ran = false + after_all_ran = false + ExampleGroup.before(:all) { before_all_ran = true } + ExampleGroup.after(:all) { after_all_ran = true } + example_group.it("should") {} + example_group.run(options) + before_all_ran.should be_false + after_all_ran.should be_false end - it "should not run the Examples in the ExampleGroup" do - example_group.run - examples_that_were_run.should == ['should be run', 'should also be run'] + it "should not run example" do + example_ran = false + example_group.it("should") {example_ran = true} + example_group.run(options) + example_ran.should be_false end end - describe ExampleGroup, "#run when specified_examples matches only Example description" do + describe ExampleGroup, "#run with specified examples" do + attr_reader :examples_that_were_run before do - examples_that_were_run = @examples_that_were_run - @example_group = Class.new(ExampleGroup) do - describe("example") - it("should be run") do - examples_that_were_run << 'should be run' - end - end - options.examples = ["should be run"] + @examples_that_were_run = [] end - it "should not run the example" do - example_group.run - examples_that_were_run.should == ['should be run'] - end - end + describe "when specified_examples matches entire ExampleGroup" do + before do + examples_that_were_run = @examples_that_were_run + @example_group = Class.new(ExampleGroup) do + describe("the ExampleGroup") + it("should be run") do + examples_that_were_run << 'should be run' + end - describe ExampleGroup, "#run when specified_examples does not match an Example description" do - before do - examples_that_were_run = @examples_that_were_run - @example_group = Class.new(ExampleGroup) do - describe("example") - it("should be something else") do - examples_that_were_run << 'should be something else' + it("should also be run") do + examples_that_were_run << 'should also be run' + end end + options.parse_example "the ExampleGroup" end - options.examples = ["does not match anything"] - end - it "should not run the example" do - example_group.run - examples_that_were_run.should == [] + it "should not run the Examples in the ExampleGroup" do + example_group.run(options) + examples_that_were_run.should == ['should be run', 'should also be run'] + end end - end - describe ExampleGroup, "#run when specified_examples matches an Example description" do - before do - examples_that_were_run = @examples_that_were_run - @example_group = Class.new(ExampleGroup) do - describe("example") - it("should be run") do - examples_that_were_run << 'should be run' - end - it("should not be run") do - examples_that_were_run << 'should not be run' + describe ExampleGroup, "#run when specified_examples matches only Example description" do + before do + examples_that_were_run = @examples_that_were_run + @example_group = Class.new(ExampleGroup) do + describe("example") + it("should be run") do + examples_that_were_run << 'should be run' + end end + options.parse_example "should be run" end - options.examples = ["should be run"] - end - it "should run only the example, when there in only one" do - example_group.run - examples_that_were_run.should == ["should be run"] + it "should not run the example" do + example_group.run(options) + examples_that_were_run.should == ['should be run'] + end end - it "should run only the one example" do - example_group.run - examples_that_were_run.should == ["should be run"] end - end - end + describe ExampleGroup, "#run when specified_examples does not match an Example description" do + before do + examples_that_were_run = @examples_that_were_run + @example_group = Class.new(ExampleGroup) do + describe("example") + it("should be something else") do + examples_that_were_run << 'should be something else' + end + end + options.parse_example "does not match anything" + end - describe ExampleGroup, "#run with success" do - before do - @special_example_group = Class.new(ExampleGroup) - ExampleGroupFactory.register(:special, @special_example_group) - @not_special_example_group = Class.new(ExampleGroup) - ExampleGroupFactory.register(:not_special, @not_special_example_group) - end + it "should not run the example" do + example_group.run(options) + examples_that_were_run.should == [] + end + end - after do - ExampleGroupFactory.reset - end + describe ExampleGroup, "#run when specified_examples matches an Example description" do + before do + examples_that_were_run = @examples_that_were_run + @example_group = Class.new(ExampleGroup) do + describe("example") + it("should be run") do + examples_that_were_run << 'should be run' + end + it("should not be run") do + examples_that_were_run << 'should not be run' + end + end + options.parse_example "should be run" + end - it "should send reporter add_example_group" do - example_group.run - reporter.example_groups.should == [example_group] - end + it "should run only the example, when there is only one" do + example_group.run(options) + examples_that_were_run.should == ["should be run"] + end - it "should run example on run" do - example_ran = false - example_group.it("should") {example_ran = true} - example_group.run - example_ran.should be_true + it "should run only the one example" do + example_group.run(options) + examples_that_were_run.should == ["should be run"] end + end end - it "should run before(:all) block only once" do - before_all_run_count_run_count = 0 - example_group.before(:all) {before_all_run_count_run_count += 1} - example_group.it("test") {true} - example_group.it("test2") {true} - example_group.run - before_all_run_count_run_count.should == 1 - end + describe ExampleGroup, "#run with success" do + before do + @special_example_group = Class.new(ExampleGroup) + ExampleGroupFactory.register(:special, @special_example_group) + @not_special_example_group = Class.new(ExampleGroup) + ExampleGroupFactory.register(:not_special, @not_special_example_group) + end - it "should run after(:all) block only once" do - after_all_run_count = 0 - example_group.after(:all) {after_all_run_count += 1} - example_group.it("test") {true} - example_group.it("test2") {true} - example_group.run - after_all_run_count.should == 1 - @reporter.rspec_verify - end + after do + ExampleGroupFactory.reset + end - it "after(:all) should have access to all instance variables defined in before(:all)" do - context_instance_value_in = "Hello there" - context_instance_value_out = "" - example_group.before(:all) { @instance_var = context_instance_value_in } - example_group.after(:all) { context_instance_value_out = @instance_var } - example_group.it("test") {true} - example_group.run - context_instance_value_in.should == context_instance_value_out - end + it "should send reporter add_example_group" do + example_group.run(options) + reporter.example_groups.should == [example_group] + end - it "should copy instance variables from before(:all)'s execution context into spec's execution context" do - context_instance_value_in = "Hello there" - context_instance_value_out = "" - example_group.before(:all) { @instance_var = context_instance_value_in } - example_group.it("test") {context_instance_value_out = @instance_var} - example_group.run - context_instance_value_in.should == context_instance_value_out - end + it "should run example on run" do + example_ran = false + example_group.it("should") {example_ran = true} + example_group.run(options) + example_ran.should be_true + end - it "should not add global before callbacks for untargetted example_group" do - fiddle = [] + it "should run before(:all) block only once" do + before_all_run_count_run_count = 0 + example_group.before(:all) {before_all_run_count_run_count += 1} + example_group.it("test") {true} + example_group.it("test2") {true} + example_group.run(options) + before_all_run_count_run_count.should == 1 + end - ExampleGroup.before(:all) { fiddle << "Example.before(:all)" } - ExampleGroup.prepend_before(:all) { fiddle << "Example.prepend_before(:all)" } - @special_example_group.before(:each) { fiddle << "Example.before(:each, :type => :special)" } - @special_example_group.prepend_before(:each) { fiddle << "Example.prepend_before(:each, :type => :special)" } - @special_example_group.before(:all) { fiddle << "Example.before(:all, :type => :special)" } - @special_example_group.prepend_before(:all) { fiddle << "Example.prepend_before(:all, :type => :special)" } + it "should run after(:all) block only once" do + after_all_run_count = 0 + example_group.after(:all) {after_all_run_count += 1} + example_group.it("test") {true} + example_group.it("test2") {true} + example_group.run(options) + after_all_run_count.should == 1 + @reporter.rspec_verify + end - example_group = Class.new(ExampleGroup) do - describe("I'm not special", :type => :not_special) - it "does nothing" - end - example_group.run - fiddle.should == [ - 'Example.prepend_before(:all)', - 'Example.before(:all)', - ] - end + it "after(:all) should have access to all instance variables defined in before(:all)" do + context_instance_value_in = "Hello there" + context_instance_value_out = "" + example_group.before(:all) { @instance_var = context_instance_value_in } + example_group.after(:all) { context_instance_value_out = @instance_var } + example_group.it("test") {true} + example_group.run(options) + context_instance_value_in.should == context_instance_value_out + end - it "should add global before callbacks for targetted example_groups" do - fiddle = [] - - ExampleGroup.before(:all) { fiddle << "Example.before(:all)" } - ExampleGroup.prepend_before(:all) { fiddle << "Example.prepend_before(:all)" } - @special_example_group.before(:each) { fiddle << "special.before(:each, :type => :special)" } - @special_example_group.prepend_before(:each) { fiddle << "special.prepend_before(:each, :type => :special)" } - @special_example_group.before(:all) { fiddle << "special.before(:all, :type => :special)" } - @special_example_group.prepend_before(:all) { fiddle << "special.prepend_before(:all, :type => :special)" } - @special_example_group.append_before(:each) { fiddle << "special.append_before(:each, :type => :special)" } - - example_group = Class.new(@special_example_group).describe("I'm a special example_group") {} - example_group.it("test") {true} - example_group.run - fiddle.should == [ - 'Example.prepend_before(:all)', - 'Example.before(:all)', - 'special.prepend_before(:all, :type => :special)', - 'special.before(:all, :type => :special)', - 'special.prepend_before(:each, :type => :special)', - 'special.before(:each, :type => :special)', - 'special.append_before(:each, :type => :special)', - ] - end + it "should copy instance variables from before(:all)'s execution context into spec's execution context" do + context_instance_value_in = "Hello there" + context_instance_value_out = "" + example_group.before(:all) { @instance_var = context_instance_value_in } + example_group.it("test") {context_instance_value_out = @instance_var} + example_group.run(options) + context_instance_value_in.should == context_instance_value_out + end - it "should order before callbacks from global to local" do - fiddle = [] - ExampleGroup.prepend_before(:all) { fiddle << "Example.prepend_before(:all)" } - ExampleGroup.before(:all) { fiddle << "Example.before(:all)" } - example_group.prepend_before(:all) { fiddle << "prepend_before(:all)" } - example_group.before(:all) { fiddle << "before(:all)" } - example_group.prepend_before(:each) { fiddle << "prepend_before(:each)" } - example_group.before(:each) { fiddle << "before(:each)" } - example_group.run - fiddle.should == [ - 'Example.prepend_before(:all)', - 'Example.before(:all)', - 'prepend_before(:all)', - 'before(:all)', - 'prepend_before(:each)', - 'before(:each)' - ] - end + it "should not add global before callbacks for untargetted example_group" do + fiddle = [] - it "should order after callbacks from local to global" do - fiddle = [] - example_group.after(:each) { fiddle << "after(:each)" } - example_group.append_after(:each) { fiddle << "append_after(:each)" } - example_group.after(:all) { fiddle << "after(:all)" } - example_group.append_after(:all) { fiddle << "append_after(:all)" } - ExampleGroup.after(:all) { fiddle << "Example.after(:all)" } - ExampleGroup.append_after(:all) { fiddle << "Example.append_after(:all)" } - example_group.run - fiddle.should == [ - 'after(:each)', - 'append_after(:each)', - 'after(:all)', - 'append_after(:all)', - 'Example.after(:all)', - 'Example.append_after(:all)' - ] - end + ExampleGroup.before(:all) { fiddle << "Example.before(:all)" } + ExampleGroup.prepend_before(:all) { fiddle << "Example.prepend_before(:all)" } + @special_example_group.before(:each) { fiddle << "Example.before(:each, :type => :special)" } + @special_example_group.prepend_before(:each) { fiddle << "Example.prepend_before(:each, :type => :special)" } + @special_example_group.before(:all) { fiddle << "Example.before(:all, :type => :special)" } + @special_example_group.prepend_before(:all) { fiddle << "Example.prepend_before(:all, :type => :special)" } - it "should have accessible instance methods from included module" do - mod1_method_called = false - mod1 = Module.new do - define_method :mod1_method do - mod1_method_called = true + example_group = Class.new(ExampleGroup) do + describe("I'm not special", :type => :not_special) + it "does nothing" + end + example_group.run(options) + fiddle.should == [ + 'Example.prepend_before(:all)', + 'Example.before(:all)', + ] + end + + it "should add global before callbacks for targetted example_groups" do + fiddle = [] + + ExampleGroup.before(:all) { fiddle << "Example.before(:all)" } + ExampleGroup.prepend_before(:all) { fiddle << "Example.prepend_before(:all)" } + @special_example_group.before(:each) { fiddle << "special.before(:each, :type => :special)" } + @special_example_group.prepend_before(:each) { fiddle << "special.prepend_before(:each, :type => :special)" } + @special_example_group.before(:all) { fiddle << "special.before(:all, :type => :special)" } + @special_example_group.prepend_before(:all) { fiddle << "special.prepend_before(:all, :type => :special)" } + @special_example_group.append_before(:each) { fiddle << "special.append_before(:each, :type => :special)" } + + example_group = Class.new(@special_example_group).describe("I'm a special example_group") {} + example_group.it("test") {true} + example_group.run(options) + fiddle.should == [ + 'Example.prepend_before(:all)', + 'Example.before(:all)', + 'special.prepend_before(:all, :type => :special)', + 'special.before(:all, :type => :special)', + 'special.prepend_before(:each, :type => :special)', + 'special.before(:each, :type => :special)', + 'special.append_before(:each, :type => :special)', + ] + end + + it "should order before callbacks from global to local" do + fiddle = [] + ExampleGroup.prepend_before(:all) { fiddle << "Example.prepend_before(:all)" } + ExampleGroup.before(:all) { fiddle << "Example.before(:all)" } + example_group.prepend_before(:all) { fiddle << "prepend_before(:all)" } + example_group.before(:all) { fiddle << "before(:all)" } + example_group.prepend_before(:each) { fiddle << "prepend_before(:each)" } + example_group.before(:each) { fiddle << "before(:each)" } + example_group.run(options) + fiddle.should == [ + 'Example.prepend_before(:all)', + 'Example.before(:all)', + 'prepend_before(:all)', + 'before(:all)', + 'prepend_before(:each)', + 'before(:each)' + ] + end + + it "should order after callbacks from local to global" do + fiddle = [] + example_group.after(:each) { fiddle << "after(:each)" } + example_group.append_after(:each) { fiddle << "append_after(:each)" } + example_group.after(:all) { fiddle << "after(:all)" } + example_group.append_after(:all) { fiddle << "append_after(:all)" } + ExampleGroup.after(:all) { fiddle << "Example.after(:all)" } + ExampleGroup.append_after(:all) { fiddle << "Example.append_after(:all)" } + example_group.run(options) + fiddle.should == [ + 'after(:each)', + 'append_after(:each)', + 'after(:all)', + 'append_after(:all)', + 'Example.after(:all)', + 'Example.append_after(:all)' + ] + end + + it "should have accessible instance methods from included module" do + mod1_method_called = false + mod1 = Module.new do + define_method :mod1_method do + mod1_method_called = true + end end - end - mod2_method_called = false - mod2 = Module.new do - define_method :mod2_method do - mod2_method_called = true + mod2_method_called = false + mod2 = Module.new do + define_method :mod2_method do + mod2_method_called = true + end end - end - example_group.include mod1, mod2 + example_group.include mod1, mod2 - example_group.it("test") do - mod1_method - mod2_method + example_group.it("test") do + mod1_method + mod2_method + end + example_group.run(options) + mod1_method_called.should be_true + mod2_method_called.should be_true end - example_group.run - mod1_method_called.should be_true - mod2_method_called.should be_true - end - it "should include targetted modules included using configuration" do - mod1 = Module.new - mod2 = Module.new - mod3 = Module.new - Spec::Runner.configuration.include(mod1, mod2) - Spec::Runner.configuration.include(mod3, :type => :not_special) + it "should include targetted modules included using configuration" do + mod1 = Module.new + mod2 = Module.new + mod3 = Module.new + Spec::Runner.configuration.include(mod1, mod2) + Spec::Runner.configuration.include(mod3, :type => :not_special) - example_group = Class.new(@special_example_group).describe("I'm special", :type => :special) do - it "does nothing" - end - example_group.run + example_group = Class.new(@special_example_group).describe("I'm special", :type => :special) do + it "does nothing" + end + example_group.run(options) - example_group.included_modules.should include(mod1) - example_group.included_modules.should include(mod2) - example_group.included_modules.should_not include(mod3) - end + example_group.included_modules.should include(mod1) + example_group.included_modules.should include(mod2) + example_group.included_modules.should_not include(mod3) + end - it "should include any predicate_matchers included using configuration" do - $included_predicate_matcher_found = false - Spec::Runner.configuration.predicate_matchers[:do_something] = :does_something? - example_group = Class.new(ExampleGroup) do - describe('example') - it "should respond to do_something" do - $included_predicate_matcher_found = respond_to?(:do_something) + it "should include any predicate_matchers included using configuration" do + $included_predicate_matcher_found = false + Spec::Runner.configuration.predicate_matchers[:do_something] = :does_something? + example_group = Class.new(ExampleGroup) do + describe('example') + it "should respond to do_something" do + $included_predicate_matcher_found = respond_to?(:do_something) + end end + example_group.run(options) + $included_predicate_matcher_found.should be(true) end - example_group.run - $included_predicate_matcher_found.should be(true) - end - it "should use a mock framework set up in config" do - mod = Module.new do - class << self - def included(mod) + it "should use a mock framework set up in config" do + mod = Module.new do + def self.included(mod) $included_module = mod end + + def teardown_mocks_for_rspec + $torn_down = true + end end - def teardown_mocks_for_rspec + begin + $included_module = nil $torn_down = true - end - end + Spec::Runner.configuration.mock_with mod - begin - $included_module = nil - $torn_down = true - Spec::Runner.configuration.mock_with mod + example_group = Class.new(ExampleGroup) do + describe('example') + it "does nothing" + end + example_group.run(options) - example_group = Class.new(ExampleGroup) do - describe('example') - it "does nothing" + $included_module.should_not be_nil + $torn_down.should == true + ensure + Spec::Runner.configuration.mock_with :rspec end - example_group.run - - $included_module.should_not be_nil - $torn_down.should == true - ensure - Spec::Runner.configuration.mock_with :rspec end end - end - describe ExampleGroup, "#run with pending example that has a failing assertion" do - before do - example_group.it("should be pending") do - pending("Example fails") {false.should be_true} + describe ExampleGroup, "#run with pending example that has a failing assertion" do + before do + example_group.it("should be pending") do + pending("Example fails") {false.should be_true} + end end - end - it "should send example_pending to formatter" do - @formatter.should_receive(:example_pending).with("example", "should be pending", "Example fails") - example_group.run + it "should send example_pending to formatter" do + @formatter.should_receive(:example_pending).with("example", "should be pending", "Example fails") + example_group.run(options) + end end - end - describe ExampleGroup, "#run with pending example that does not have a failing assertion" do - it_should_behave_like "Spec::Example::ExampleGroup#run with failure in example" + describe ExampleGroup, "#run with pending example that does not have a failing assertion" do + it_should_behave_like "Spec::Example::ExampleGroup#run with failure in example" - before do - example_group.it("should be pending") do - pending("Example passes") {true.should be_true} + before do + example_group.it("should be pending") do + pending("Example passes") {true.should be_true} + end end - end - it "should send example_pending to formatter" do - @formatter.should_receive(:example_pending).with("example", "should be pending", "Example passes") - example_group.run + it "should send example_pending to formatter" do + @formatter.should_receive(:example_pending).with("example", "should be pending", "Example passes") + example_group.run(options) + end end - end - - describe ExampleGroup, "#run when before(:all) fails" do - it_should_behave_like "Spec::Example::ExampleGroup#run with failure in example" - before do - ExampleGroup.before(:all) { raise NonStandardError, "before(:all) failure" } - end + describe ExampleGroup, "#run when before(:all) fails" do + it_should_behave_like "Spec::Example::ExampleGroup#run with failure in example" - it "should not run any example" do - spec_ran = false - example_group.it("test") {spec_ran = true} - example_group.run - spec_ran.should be_false - end + before do + ExampleGroup.before(:all) { raise NonStandardError, "before(:all) failure" } + end - it "should run ExampleGroup after(:all)" do - after_all_ran = false - ExampleGroup.after(:all) { after_all_ran = true } - example_group.run - after_all_ran.should be_true - end + it "should not run any example" do + spec_ran = false + example_group.it("test") {spec_ran = true} + example_group.run(options) + spec_ran.should be_false + end - it "should run example_group after(:all)" do - after_all_ran = false - example_group.after(:all) { after_all_ran = true } - example_group.run - after_all_ran.should be_true - end + it "should run ExampleGroup after(:all)" do + after_all_ran = false + ExampleGroup.after(:all) { after_all_ran = true } + example_group.run(options) + after_all_ran.should be_true + end - it "should supply before(:all) as description" do - @reporter.should_receive(:failure) do |example, error| - example.description.should eql("before(:all)") - error.message.should eql("before(:all) failure") + it "should run example_group after(:all)" do + after_all_ran = false + example_group.after(:all) { after_all_ran = true } + example_group.run(options) + after_all_ran.should be_true end - example_group.it("test") {true} - example_group.run + it "should supply before(:all) as description" do + @reporter.should_receive(:failure) do |example, error| + example.description.should eql("before(:all)") + error.message.should eql("before(:all) failure") + end + + example_group.it("test") {true} + example_group.run(options) + end end - end - describe ExampleGroup, "#run when before(:each) fails" do - it_should_behave_like "Spec::Example::ExampleGroup#run with failure in example" + describe ExampleGroup, "#run when before(:each) fails" do + it_should_behave_like "Spec::Example::ExampleGroup#run with failure in example" - before do - ExampleGroup.before(:each) { raise NonStandardError } - end + before do + ExampleGroup.before(:each) { raise NonStandardError } + end - it "should run after(:all)" do - after_all_ran = false - ExampleGroup.after(:all) { after_all_ran = true } - example_group.run - after_all_ran.should be_true + it "should run after(:all)" do + after_all_ran = false + ExampleGroup.after(:all) { after_all_ran = true } + example_group.run(options) + after_all_ran.should be_true + end end - end - describe ExampleGroup, "#run when any example fails" do - it_should_behave_like "Spec::Example::ExampleGroup#run with failure in example" + describe ExampleGroup, "#run when any example fails" do + it_should_behave_like "Spec::Example::ExampleGroup#run with failure in example" - before do - example_group.it("should") { raise NonStandardError } - end + before do + example_group.it("should") { raise NonStandardError } + end - it "should run after(:all)" do - after_all_ran = false - ExampleGroup.after(:all) { after_all_ran = true } - example_group.run - after_all_ran.should be_true + it "should run after(:all)" do + after_all_ran = false + ExampleGroup.after(:all) { after_all_ran = true } + example_group.run(options) + after_all_ran.should be_true + end end - end - describe ExampleGroup, "#run when first after(:each) block fails" do - it_should_behave_like "Spec::Example::ExampleGroup#run with failure in example" + describe ExampleGroup, "#run when first after(:each) block fails" do + it_should_behave_like "Spec::Example::ExampleGroup#run with failure in example" - before do - class << example_group - attr_accessor :first_after_ran, :second_after_ran - end - example_group.first_after_ran = false - example_group.second_after_ran = false + before do + class << example_group + attr_accessor :first_after_ran, :second_after_ran + end + example_group.first_after_ran = false + example_group.second_after_ran = false - example_group.after(:each) do - self.class.second_after_ran = true - end - example_group.after(:each) do - self.class.first_after_ran = true - raise "first" + example_group.after(:each) do + self.class.second_after_ran = true + end + example_group.after(:each) do + self.class.first_after_ran = true + raise "first" + end end - end - it "should run second after(:each) block" do - reporter.should_receive(:example_finished) do |example, error| - example.should equal(example) - error.message.should eql("first") + it "should run second after(:each) block" do + reporter.should_receive(:example_finished) do |example, error| + example.should equal(example) + error.message.should eql("first") + end + example_group.run(options) + example_group.first_after_ran.should be_true + example_group.second_after_ran.should be_true end - example_group.run - example_group.first_after_ran.should be_true - example_group.second_after_ran.should be_true end - end - describe ExampleGroup, "#run when first before(:each) block fails" do - it_should_behave_like "Spec::Example::ExampleGroup#run with failure in example" + describe ExampleGroup, "#run when first before(:each) block fails" do + it_should_behave_like "Spec::Example::ExampleGroup#run with failure in example" - before do - class << example_group - attr_accessor :first_before_ran, :second_before_ran - end - example_group.first_before_ran = false - example_group.second_before_ran = false + before do + class << example_group + attr_accessor :first_before_ran, :second_before_ran + end + example_group.first_before_ran = false + example_group.second_before_ran = false - example_group.before(:each) do - self.class.first_before_ran = true - raise "first" - end - example_group.before(:each) do - self.class.second_before_ran = true + example_group.before(:each) do + self.class.first_before_ran = true + raise "first" + end + example_group.before(:each) do + self.class.second_before_ran = true + end end - end - it "should not run second before(:each)" do - reporter.should_receive(:example_finished) do |name, error| - error.message.should eql("first") + it "should not run second before(:each)" do + reporter.should_receive(:example_finished) do |name, error| + error.message.should eql("first") + end + example_group.run(options) + example_group.first_before_ran.should be_true + example_group.second_before_ran.should be_false end - example_group.run - example_group.first_before_ran.should be_true - example_group.second_before_ran.should be_false end - end - describe ExampleGroup, "#run when failure in after(:all)" do - it_should_behave_like "Spec::Example::ExampleGroup#run with failure in example" + describe ExampleGroup, "#run when failure in after(:all)" do + it_should_behave_like "Spec::Example::ExampleGroup#run with failure in example" - before do - ExampleGroup.after(:all) { raise NonStandardError, "in after(:all)" } - end + before do + ExampleGroup.after(:all) { raise NonStandardError, "in after(:all)" } + end - it "should return false" do - example_group.run.should be_false + it "should return false" do + example_group.run(options).should be_false + end end end end @@ -659,7 +659,7 @@ module Spec example_group = Class.new(ExampleSubclass) do describe(Array) end - example_group.send(:described_type).should == Array + example_group.__send__(:described_type).should == Array end it "should concat descriptions when nested" do @@ -671,53 +671,5 @@ module Spec $nested_group.description.to_s.should == "Array when empty" end end - - describe Enumerable do - before(:each) do - Kernel.stub!(:warn) - end - - def each(&block) - ["4", "2", "1"].each(&block) - end - - it "should be included in examples because it is a module" do - map{|e| e.to_i}.should == [4,2,1] - end - end - - describe "An", Enumerable, "as a second argument" do - before(:each) do - Kernel.stub!(:warn) - end - - def each(&block) - ["4", "2", "1"].each(&block) - end - - it "should be included in examples because it is a module" do - map{|e| e.to_i}.should == [4,2,1] - end - end - - describe Enumerable do - describe "as the parent of nested example groups" do - before(:each) do - Kernel.stub!(:warn) - end - - it "should be included in examples because it is a module" do - pending("need to make sure nested groups know the described type") do - map{|e| e.to_i}.should == [4,2,1] - end - end - end - end - - describe String do - it "should not be included in examples because it is not a module" do - lambda{self.map}.should raise_error(NoMethodError, /undefined method `map' for/) - end - end end end vendor/plugins/rspec/spec/spec/example/example_group_spec.rb @@ -2,31 +2,14 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' module Spec module Example - module ExampleMatcherSpecHelper - class MatchDescription - def initialize(description) - @description = description - end - - def matches?(matcher) - matcher.matches?(@description) - end - - def failure_message - "expected matcher.matches?(#{@description.inspect}) to return true, got false" - end - - def negative_failure_message - "expected matcher.matches?(#{@description.inspect}) to return false, got true" - end - end + describe ExampleMatcher, "#matches?" do def match_description(description) - MatchDescription.new(description) + simple_matcher do |actual, matcher| + matcher.failure_message = "expected matcher.matches?(#{description.inspect}) to return true, got false" + matcher.negative_failure_message = "expected matcher.matches?(#{description.inspect}) to return false, got true" + actual.matches?(description) + end end - end - - describe ExampleMatcher, "#matches?" do - include ExampleMatcherSpecHelper it "should match correct example_group and example" do matcher = ExampleMatcher.new("example_group", "example") vendor/plugins/rspec/spec/spec/example/example_matcher_spec.rb @@ -22,105 +22,270 @@ module Spec end describe "lifecycle" do - before do - @original_rspec_options = $rspec_options - @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new) - $rspec_options = @options - @options.formatters << mock("formatter", :null_object => true) - @options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true) - @reporter = FakeReporter.new(@options) - @options.reporter = @reporter - - ExampleMethods.before_all_parts.should == [] - ExampleMethods.before_each_parts.should == [] - ExampleMethods.after_each_parts.should == [] - ExampleMethods.after_all_parts.should == [] - def ExampleMethods.count - @count ||= 0 - @count = @count + 1 - @count + with_sandboxed_options do + with_sandboxed_config do + before do + @options.formatters << mock("formatter", :null_object => true) + @options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true) + @reporter = FakeReporter.new(@options) + @options.reporter = @reporter + + ExampleGroup.before_all_parts.should == [] + ExampleGroup.before_each_parts.should == [] + ExampleGroup.after_each_parts.should == [] + ExampleGroup.after_all_parts.should == [] + def ExampleGroup.count + @count ||= 0 + @count = @count + 1 + @count + end + end end - end - after do - $rspec_options = @original_rspec_options - ExampleMethods.instance_variable_set("@before_all_parts", []) - ExampleMethods.instance_variable_set("@before_each_parts", []) - ExampleMethods.instance_variable_set("@after_each_parts", []) - ExampleMethods.instance_variable_set("@after_all_parts", []) - end - - it "should pass before and after callbacks to all ExampleGroup subclasses" do - ExampleMethods.before(:suite) do - ExampleMethods.count.should == 1 + after do + ExampleGroup.instance_variable_set("@before_all_parts", []) + ExampleGroup.instance_variable_set("@before_each_parts", []) + ExampleGroup.instance_variable_set("@after_each_parts", []) + ExampleGroup.instance_variable_set("@after_all_parts", []) end - ExampleMethods.before(:all) do - ExampleMethods.count.should == 2 - end + describe "eval_block" do + before(:each) do + @example_group = Class.new(ExampleGroup) + end + + describe "with a given description" do + it "should provide the given description" do + @example = @example_group.it("given description") { 2.should == 2 } + @example.eval_block + @example.description.should == "given description" + end + end - ExampleMethods.before(:each) do - ExampleMethods.count.should == 3 + describe "with no given description" do + it "should provide the generated description" do + @example = @example_group.it { 2.should == 2 } + @example.eval_block + @example.description.should == "should == 2" + end + end + + describe "with no implementation" do + it "should raise an NotYetImplementedError" do + lambda { + @example = @example_group.it + @example.eval_block + }.should raise_error(Spec::Example::NotYetImplementedError, "Not Yet Implemented") + end + + def extract_error(&blk) + begin + blk.call + rescue Exception => e + return e + end + + nil + end + + it "should use the proper file and line number for the NotYetImplementedError" do + file = __FILE__ + line_number = __LINE__ + 3 + + error = extract_error do + @example = @example_group.it + @example.eval_block + end + + error.pending_caller.should == "#{file}:#{line_number}" + end + end end + end + end - ExampleMethods.after(:each) do - ExampleMethods.count.should == 4 + describe "#backtrace" do + with_sandboxed_options do + it "returns the backtrace from where the example was defined" do + example_group = Class.new(ExampleGroup) do + example "of something" do; end + end + + example = example_group.examples.first + example.backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-4}") end - - ExampleMethods.after(:all) do - ExampleMethods.count.should == 5 + end + end + + describe "#implementation_backtrace (deprecated)" do + with_sandboxed_options do + before(:each) do + Kernel.stub!(:warn) end - ExampleMethods.after(:suite) do - ExampleMethods.count.should == 6 + it "sends a deprecation warning" do + example_group = Class.new(ExampleGroup) {} + example = example_group.example("") {} + Kernel.should_receive(:warn).with(/#implementation_backtrace.*deprecated.*#backtrace instead/m) + example.implementation_backtrace end - - @example_group = Class.new(ExampleGroup) do - it "should use ExampleMethods callbacks" do + + it "returns the backtrace from where the example was defined" do + example_group = Class.new(ExampleGroup) do + example "of something" do; end end + + example = example_group.examples.first + example.backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-4}") end - @options.run_examples - ExampleMethods.count.should == 7 end + end - describe "run_with_description_capturing" do - before(:each) do - @example_group = Class.new(ExampleGroup) do end - @example = @example_group.new("foo", &(lambda { 2.should == 2 })) - @example.run_with_description_capturing + describe "#full_description" do + it "should return the full description of the ExampleGroup and Example" do + example_group = Class.new(ExampleGroup).describe("An ExampleGroup") do + it "should do something" do + end end - - it "should provide the generated description" do - @example.instance_eval { @_matcher_description }.should == "should == 2" + example = example_group.examples.first + example.full_description.should == "An ExampleGroup should do something" + end + end + + describe "#subject" do + with_sandboxed_options do + it "should return an instance variable named after the described type" do + example_group = Class.new(ExampleGroup).describe(Array) do + example {} + end + example = example_group.examples.first + example.subject.should == [] end - - it "should clear the global generated_description" do - Spec::Matchers.generated_description.should == nil + + it "should not barf on a module (as opposed to a class)" do + example_group = Class.new(ExampleGroup).describe(ObjectSpace) do + example {} + end + example_group.examples.first.subject.should be_nil + end + + it "should not barf on a string" do + example_group = Class.new(ExampleGroup).describe('foo') do + example {} + end + example_group.examples.first.subject.should be_nil + end + + it "should interact with the same scope as the before block" do + example_group = Class.new(ExampleGroup) do + subject { @foo = 'foo'} + example { should == @foo} + it { should == 'foo'} + end + example_group.run(options).should be_true end end end - describe "#implementation_backtrace" do - it "returns the backtrace of where the implementation was defined" do - example_group = Class.new(ExampleGroup) do - it "should use ExampleMethods callbacks" do + describe "#should" do + with_sandboxed_options do + class Thing + def ==(other) + true end end - example = example_group.examples.first - example.implementation_backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-4}") + + describe "in an ExampleGroup with the ivar defined in before" do + attr_reader :example, :success + + before(:each) do + example_group = describe(Thing, "1") do + before(:each) { @spec_example_thing = 'expected' } + it { should eql('expected') } + end + @example = example_group.examples.first + @success = example_group.run(options) + end + + it "should create an example using the description from the matcher" do + example.description.should == 'should eql "expected"' + end + + it "should test the matcher returned from the block" do + success.should be_true + end + end + + describe "in an ExampleGroup with the subject defined using #subject" do + it "should create an example using the description from the matcher" do + example_group = describe(Thing, "2") do + subject {'this is the subject'} + it { should eql('this is the subject') } + end + example = example_group.examples.first + example_group.run(options) + example.description.should =~ /should eql "this is the subject"/ + end + end + + describe "in an ExampleGroup using an implicit ivar" do + it "should create an example using the description from the matcher" do + example_group = describe(Thing, "3") do + it { should == Thing.new } + end + example = example_group.examples.first + success = example_group.run(options) + example.description.should =~ /should == #<Spec::Example::Thing/ + success.should be_true + end + end + + after(:each) do + ExampleGroup.reset + end + end end - describe "#__full_description" do - it "should return the full description of the ExampleGroup and Example" do - example_group = Class.new(ExampleGroup).describe("An ExampleGroup") do - it "should do something" do + describe "#should_not" do + with_sandboxed_options do + + attr_reader :example_group, :example, :success + + before do + @example_group = Class.new(ExampleGroup) do + def subject; @actual; end + before(:each) { @actual = 'expected' } + it { should_not eql('unexpected') } end + @example = @example_group.examples.first + + @success = example_group.run(options) end - example = example_group.examples.first - example.__full_description.should == "An ExampleGroup should do something" + + it "should create an example using the description from the matcher" do + example.description.should == 'should not eql "unexpected"' + end + + it "should test the matcher returned from the block" do + success.should be_true + end + + after do + ExampleGroup.reset + end + end end end + + describe "#options" do + it "should expose the options hash" do + example_group = Class.new(ExampleGroup) + example = example_group.example "name", :this => 'that' do; end + example.options[:this].should == 'that' + end + end + end -end \ No newline at end of file +end vendor/plugins/rspec/spec/spec/example/example_methods_spec.rb @@ -4,14 +4,12 @@ module Spec it 'should raise an ExamplePendingError if no block is supplied' do lambda { - include Pending pending "TODO" }.should raise_error(ExamplePendingError, /TODO/) end it 'should raise an ExamplePendingError if a supplied block fails as expected' do lambda { - include Pending pending "TODO" do raise "oops" end @@ -20,7 +18,6 @@ module Spec it 'should raise an ExamplePendingError if a supplied block fails as expected with a mock' do lambda { - include Pending pending "TODO" do m = mock('thing') m.should_receive(:foo) @@ -31,12 +28,112 @@ module Spec it 'should raise a PendingExampleFixedError if a supplied block starts working' do lambda { - include Pending pending "TODO" do # success! end }.should raise_error(PendingExampleFixedError, /TODO/) end + + it "should have the correct file and line number for pending given with a block which fails" do + file = __FILE__ + line_number = __LINE__ + 2 + begin + pending do + raise + end + rescue => error + error.pending_caller.should == "#{file}:#{line_number}" + end + end + + it "should have the correct file and line number for pending given with no block" do + file = __FILE__ + line_number = __LINE__ + 2 + begin + pending("TODO") + rescue => error + error.pending_caller.should == "#{file}:#{line_number}" + end + end + end + + describe ExamplePendingError do + it "should have the caller (from two calls from initialization)" do + two_calls_ago = caller[0] + ExamplePendingError.new("a message").pending_caller.should == two_calls_ago + end + + it "should keep the trace information from initialization" do + two_calls_ago = caller[0] + obj = ExamplePendingError.new("a message") + obj.pending_caller + def another_caller(obj) + obj.pending_caller + end + + another_caller(obj).should == two_calls_ago + end + + it "should have the message provided" do + ExamplePendingError.new("a message").message.should == "a message" + end + + it "should use a 'ExamplePendingError' as it's default message" do + ExamplePendingError.new.message.should == "Spec::Example::ExamplePendingError" + end + end + + describe NotYetImplementedError do + def rspec_root + File.expand_path(__FILE__.gsub("/spec/spec/example/pending_module_spec.rb", "/lib")) + end + + it "should have the root rspec path" do + NotYetImplementedError::RSPEC_ROOT_LIB.should == rspec_root + end + + it "should always have the error 'Not Yet Implemented'" do + NotYetImplementedError.new([]).message.should == "Not Yet Implemented" + end + + describe "pending_caller" do + it "should select an element out of the backtrace" do + error = NotYetImplementedError.new(["foo/bar.rb:18"]) + + error.pending_caller.should == "foo/bar.rb:18" + end + + it "should actually report the element from the backtrace" do + error = NotYetImplementedError.new(["bar.rb:18"]) + + error.pending_caller.should == "bar.rb:18" + end + + it "should not use an element with the rspec root path" do + error = NotYetImplementedError.new(["#{rspec_root}:8"]) + + error.pending_caller.should be_nil + end + + it "should select the first line in the backtrace which isn't in the rspec root" do + error = NotYetImplementedError.new([ + "#{rspec_root}/foo.rb:2", + "#{rspec_root}/foo/bar.rb:18", + "path1.rb:22", + "path2.rb:33" + ]) + + error.pending_caller.should == "path1.rb:22" + end + + it "should cache the caller" do + backtrace = mock('backtrace') + backtrace.should_receive(:detect).once + + error = NotYetImplementedError.new(backtrace) + error.pending_caller.should == error.pending_caller + end + end end end end vendor/plugins/rspec/spec/spec/example/pending_module_spec.rb @@ -3,262 +3,254 @@ require File.dirname(__FILE__) + '/../../spec_helper' module Spec module Example describe ExampleGroup, "with :shared => true" do - it_should_behave_like "sandboxed rspec_options" - attr_reader :formatter, :example_group - before(:each) do - @formatter = Spec::Mocks::Mock.new("formatter", :null_object => true) - options.formatters << formatter - @example_group = Class.new(ExampleGroup).describe("example_group") - class << example_group - public :include + with_sandboxed_options do + attr_reader :formatter, :example_group + before(:each) do + @formatter = Spec::Mocks::Mock.new("formatter", :null_object => true) + options.formatters << formatter + @example_group = Class.new(ExampleGroup).describe("example_group") + class << example_group + public :include + end end - end - - after(:each) do - @formatter.rspec_verify - @example_group = nil - $shared_example_groups.clear unless $shared_example_groups.nil? - end - - def make_shared_example_group(name, opts=nil, &block) - example_group = SharedExampleGroup.new(name, :shared => true, &block) - SharedExampleGroup.add_shared_example_group(example_group) - example_group - end - - def non_shared_example_group() - @non_shared_example_group ||= Class.new(ExampleGroup).describe("example_group") - end - - it "should accept an optional options hash" do - lambda { Class.new(ExampleGroup).describe("context") }.should_not raise_error(Exception) - lambda { Class.new(ExampleGroup).describe("context", :shared => true) }.should_not raise_error(Exception) - end - it "should return all shared example_groups" do - b1 = make_shared_example_group("b1", :shared => true) {} - b2 = make_shared_example_group("b2", :shared => true) {} + after(:each) do + @formatter.rspec_verify + @example_group = nil + Spec::Example::SharedExampleGroup.clear + end + + describe "#register" do + it "creates a new shared example group with the submitted args" do + block = lambda {} + group = SharedExampleGroup.new("shared group") do end + Spec::Example::SharedExampleGroup.should_receive(:new).with("share me", &block).and_return(group) + Spec::Example::SharedExampleGroup.register("share me", &block) + end - b1.should_not be(nil) - b2.should_not be(nil) + it "registers the shared example group" do + lambda do + Spec::Example::SharedExampleGroup.register "share me" do end + end.should change {Spec::Example::SharedExampleGroup.count}.by(1) + end + end - SharedExampleGroup.find_shared_example_group("b1").should equal(b1) - SharedExampleGroup.find_shared_example_group("b2").should equal(b2) - end + it "complains when adding a second shared example_group with the same description" do + describe "shared example_group", :shared => true do + end + lambda do + describe "shared example_group", :shared => true do + end + end.should raise_error(ArgumentError) + end + + it "does NOT add the same group twice" do + lambda do + 2.times do + describe "shared example_group which gets loaded twice", :shared => true do + end + end + end.should change {Spec::Example::SharedExampleGroup.count}.by(1) + end - it "should register as shared example_group" do - example_group = make_shared_example_group("example_group") {} - SharedExampleGroup.shared_example_groups.should include(example_group) - end + it "does NOT complain when adding the same shared example_group again (i.e. file gets reloaded)" do + lambda do + 2.times do + describe "shared example_group which gets loaded twice", :shared => true do + end + end + end.should_not raise_error(ArgumentError) + end - it "should not be shared when not configured as shared" do - example_group = non_shared_example_group - SharedExampleGroup.shared_example_groups.should_not include(example_group) - end + it "does NOT complain when adding the same shared example_group in same file with different absolute path" do + SharedExampleGroup.register( + "shared example_group", + :shared => true, + :spec_path => "/my/spec/a/../shared.rb" + ) + SharedExampleGroup.register( + "shared example_group", + :shared => true, + :spec_path => "/my/spec/b/../shared.rb" + ) + end - it "should complain when adding a second shared example_group with the same description" do - describe "shared example_group", :shared => true do + it "complains when adding a different shared example_group with the same name in a different file with the same basename" do + SharedExampleGroup.register( + "shared example_group", + :shared => true, + :spec_path => "/my/spec/a/shared.rb" + ) + lambda do + SharedExampleGroup.register( + "shared example_group", + :shared => true, + :spec_path => "/my/spec/b/shared.rb" + ) + end.should raise_error(ArgumentError, /already exists/) end - lambda do - describe "shared example_group", :shared => true do + + it "adds examples to current example_group using it_should_behave_like" do + shared_example_group = SharedExampleGroup.register("shared example_group") do + it("shared example") {} + it("shared example 2") {} end - end.should raise_error(ArgumentError) - end - it "should NOT complain when adding the same shared example_group instance again" do - shared_example_group = Class.new(ExampleGroup).describe("shared example_group", :shared => true) - SharedExampleGroup.add_shared_example_group(shared_example_group) - SharedExampleGroup.add_shared_example_group(shared_example_group) - end + example_group.it("example") {} + example_group.number_of_examples.should == 1 + example_group.it_should_behave_like("shared example_group") + example_group.number_of_examples.should == 3 + end - it "should NOT complain when adding the same shared example_group again (i.e. file gets reloaded)" do - lambda do - 2.times do - describe "shared example_group which gets loaded twice", :shared => true do - end + it "adds examples to from two shared groups" do + shared_example_group_1 = SharedExampleGroup.register("shared example_group 1") do + it("shared example 1") {} end - end.should_not raise_error(ArgumentError) - end - - it "should NOT complain when adding the same shared example_group in same file with different absolute path" do - shared_example_group_1 = Class.new(ExampleGroup).describe( - "shared example_group", - :shared => true, - :spec_path => "/my/spec/a/../shared.rb" - ) - shared_example_group_2 = Class.new(ExampleGroup).describe( - "shared example_group", - :shared => true, - :spec_path => "/my/spec/b/../shared.rb" - ) - - SharedExampleGroup.add_shared_example_group(shared_example_group_1) - SharedExampleGroup.add_shared_example_group(shared_example_group_2) - end - it "should complain when adding a different shared example_group with the same name in a different file with the same basename" do - shared_example_group_1 = Class.new(ExampleGroup).describe( - "shared example_group", - :shared => true, - :spec_path => "/my/spec/a/shared.rb" - ) - shared_example_group_2 = Class.new(ExampleGroup).describe( - "shared example_group", - :shared => true, - :spec_path => "/my/spec/b/shared.rb" - ) - - SharedExampleGroup.add_shared_example_group(shared_example_group_1) - lambda do - SharedExampleGroup.add_shared_example_group(shared_example_group_2) - end.should raise_error(ArgumentError, /already exists/) - end + shared_example_group_1 = SharedExampleGroup.register("shared example_group 2") do + it("shared example 2") {} + end - it "should add examples to current example_group using it_should_behave_like" do - shared_example_group = make_shared_example_group("shared example_group") do - it("shared example") {} - it("shared example 2") {} + example_group.it("example") {} + example_group.number_of_examples.should == 1 + example_group.it_should_behave_like("shared example_group 1", "shared example_group 2") + example_group.number_of_examples.should == 3 end - example_group.it("example") {} - example_group.number_of_examples.should == 1 - example_group.it_should_behave_like("shared example_group") - example_group.number_of_examples.should == 3 - end - - it "should add examples to current example_group using include" do - shared_example_group = describe "all things", :shared => true do - it "should do stuff" do end - end + it "adds examples to current example_group using include" do + shared_example_group = describe "all things", :shared => true do + it "should do stuff" do end + end - example_group = describe "one thing" do - include shared_example_group - end + example_group = describe "one thing" do + include shared_example_group + end - example_group.number_of_examples.should == 1 - end - - it "should add examples to current example_group using it_should_behave_like with a module" do - AllThings = describe "all things", :shared => true do - it "should do stuff" do end + example_group.number_of_examples.should == 1 end + + it "adds examples to current example_group using it_should_behave_like with a module" do + AllThings = describe "all things", :shared => true do + it "should do stuff" do end + end - example_group = describe "one thing" do - it_should_behave_like AllThings - end + example_group = describe "one thing" do + it_should_behave_like AllThings + end - example_group.number_of_examples.should == 1 - end - - it "should run shared examples" do - shared_example_ran = false - shared_example_group = make_shared_example_group("shared example_group") do - it("shared example") { shared_example_ran = true } + example_group.number_of_examples.should == 1 end - example_ran = false + it "runs shared examples" do + shared_example_ran = false + shared_example_group = SharedExampleGroup.register("shared example_group") do + it("shared example") { shared_example_ran = true } + end - example_group.it_should_behave_like("shared example_group") - example_group.it("example") {example_ran = true} - example_group.run - example_ran.should be_true - shared_example_ran.should be_true - end + example_ran = false - it "should run setup and teardown from shared example_group" do - shared_setup_ran = false - shared_teardown_ran = false - shared_example_group = make_shared_example_group("shared example_group") do - before { shared_setup_ran = true } - after { shared_teardown_ran = true } - it("shared example") { shared_example_ran = true } + example_group.it_should_behave_like("shared example_group") + example_group.it("example") {example_ran = true} + example_group.run(options) + example_ran.should be_true + shared_example_ran.should be_true end - example_ran = false + it "runs before(:each) and after(:each) from shared example_group" do + shared_setup_ran = false + shared_teardown_ran = false + shared_example_group = SharedExampleGroup.register("shared example_group") do + before(:each) { shared_setup_ran = true } + after(:each) { shared_teardown_ran = true } + it("shared example") { shared_example_ran = true } + end - example_group.it_should_behave_like("shared example_group") - example_group.it("example") {example_ran = true} - example_group.run - example_ran.should be_true - shared_setup_ran.should be_true - shared_teardown_ran.should be_true - end + example_ran = false - it "should run before(:all) and after(:all) only once from shared example_group" do - shared_before_all_run_count = 0 - shared_after_all_run_count = 0 - shared_example_group = make_shared_example_group("shared example_group") do - before(:all) { shared_before_all_run_count += 1} - after(:all) { shared_after_all_run_count += 1} - it("shared example") { shared_example_ran = true } + example_group.it_should_behave_like("shared example_group") + example_group.it("example") {example_ran = true} + example_group.run(options) + example_ran.should be_true + shared_setup_ran.should be_true + shared_teardown_ran.should be_true end - example_ran = false - - example_group.it_should_behave_like("shared example_group") - example_group.it("example") {example_ran = true} - example_group.run - example_ran.should be_true - shared_before_all_run_count.should == 1 - shared_after_all_run_count.should == 1 - end + it "should run before(:all) and after(:all) only once from shared example_group" do + shared_before_all_run_count = 0 + shared_after_all_run_count = 0 + shared_example_group = SharedExampleGroup.register("shared example_group") do + before(:all) { shared_before_all_run_count += 1} + after(:all) { shared_after_all_run_count += 1} + it("shared example") { shared_example_ran = true } + end - it "should include modules, included into shared example_group, into current example_group" do - @formatter.should_receive(:add_example_group).with(any_args) + example_ran = false - shared_example_group = make_shared_example_group("shared example_group") do - it("shared example") { shared_example_ran = true } + example_group.it_should_behave_like("shared example_group") + example_group.it("example") {example_ran = true} + example_group.run(options) + example_ran.should be_true + shared_before_all_run_count.should == 1 + shared_after_all_run_count.should == 1 end - mod1_method_called = false - mod1 = Module.new do - define_method :mod1_method do - mod1_method_called = true + it "should include modules, included into shared example_group, into current example_group" do + @formatter.should_receive(:add_example_group).with(any_args) + + shared_example_group = SharedExampleGroup.register("shared example_group") do + it("shared example") { shared_example_ran = true } end - end - mod2_method_called = false - mod2 = Module.new do - define_method :mod2_method do - mod2_method_called = true + mod1_method_called = false + mod1 = Module.new do + define_method :mod1_method do + mod1_method_called = true + end + end + + mod2_method_called = false + mod2 = Module.new do + define_method :mod2_method do + mod2_method_called = true + end end - end - shared_example_group.include mod2 + shared_example_group.__send__ :include, mod2 - example_group.