vendor/plugins/rspec-rails/.gitignore vendor/plugins/rspec-rails/MIT-LICENSE vendor/plugins/rspec-rails/README vendor/plugins/rspec-rails/Rakefile vendor/plugins/rspec-rails/generators/rspec/CHANGES vendor/plugins/rspec-rails/generators/rspec/rspec_generator.rb vendor/plugins/rspec-rails/generators/rspec/templates/all_stories.rb vendor/plugins/rspec-rails/generators/rspec/templates/previous_failures.txt vendor/plugins/rspec-rails/generators/rspec/templates/rcov.opts vendor/plugins/rspec-rails/generators/rspec/templates/script/spec vendor/plugins/rspec-rails/generators/rspec/templates/script/spec_server vendor/plugins/rspec-rails/generators/rspec/templates/spec.opts vendor/plugins/rspec-rails/generators/rspec/templates/spec_helper.rb vendor/plugins/rspec-rails/generators/rspec/templates/stories_helper.rb vendor/plugins/rspec-rails/generators/rspec_controller/USAGE vendor/plugins/rspec-rails/generators/rspec_controller/rspec_controller_generator.rb vendor/plugins/rspec-rails/generators/rspec_controller/templates/controller_spec.rb vendor/plugins/rspec-rails/generators/rspec_controller/templates/helper_spec.rb vendor/plugins/rspec-rails/generators/rspec_controller/templates/view_spec.rb vendor/plugins/rspec-rails/generators/rspec_model/USAGE vendor/plugins/rspec-rails/generators/rspec_model/rspec_model_generator.rb vendor/plugins/rspec-rails/generators/rspec_model/templates/model_spec.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/rspec_scaffold_generator.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/controller_spec.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/edit_erb_spec.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/helper_spec.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/index_erb_spec.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/new_erb_spec.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/routing_spec.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/show_erb_spec.rb vendor/plugins/rspec-rails/init.rb vendor/plugins/rspec-rails/lib/autotest/discover.rb vendor/plugins/rspec-rails/lib/autotest/rails_rspec.rb vendor/plugins/rspec-rails/lib/spec/rails.rb vendor/plugins/rspec-rails/lib/spec/rails/example.rb vendor/plugins/rspec-rails/lib/spec/rails/example/assigns_hash_proxy.rb vendor/plugins/rspec-rails/lib/spec/rails/example/controller_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/example/functional_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/example/helper_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/example/model_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/example/rails_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/example/render_observer.rb vendor/plugins/rspec-rails/lib/spec/rails/example/view_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/action_controller/base.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/action_controller/rescue.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/action_controller/test_response.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/action_view/base.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/active_record/base.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/object.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/spec/example/configuration.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/spec/matchers/have.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers/assert_select.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers/have_text.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers/include_text.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers/redirect_to.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers/render_template.rb vendor/plugins/rspec-rails/lib/spec/rails/story_adapter.rb vendor/plugins/rspec-rails/lib/spec/rails/version.rb vendor/plugins/rspec-rails/spec/rails/autotest/mappings_spec.rb vendor/plugins/rspec-rails/spec/rails/autotest/rails_rspec_spec.rb vendor/plugins/rspec-rails/spec/rails/example/assigns_hash_proxy_spec.rb vendor/plugins/rspec-rails/spec/rails/example/configuration_spec.rb vendor/plugins/rspec-rails/spec/rails/example/controller_isolation_spec.rb vendor/plugins/rspec-rails/spec/rails/example/controller_spec_spec.rb vendor/plugins/rspec-rails/spec/rails/example/example_group_factory_spec.rb vendor/plugins/rspec-rails/spec/rails/example/helper_spec_spec.rb vendor/plugins/rspec-rails/spec/rails/example/model_spec_spec.rb vendor/plugins/rspec-rails/spec/rails/example/shared_behaviour_spec.rb vendor/plugins/rspec-rails/spec/rails/example/test_unit_assertion_accessibility_spec.rb vendor/plugins/rspec-rails/spec/rails/example/view_spec_spec.rb vendor/plugins/rspec-rails/spec/rails/extensions/action_controller_rescue_action_spec.rb vendor/plugins/rspec-rails/spec/rails/extensions/action_view_base_spec.rb vendor/plugins/rspec-rails/spec/rails/extensions/active_record_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/assert_select_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/description_generation_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/errors_on_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/have_text_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/include_text_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/redirect_to_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/render_spec.rb vendor/plugins/rspec-rails/spec/rails/mocks/ar_classes.rb vendor/plugins/rspec-rails/spec/rails/mocks/mock_model_spec.rb vendor/plugins/rspec-rails/spec/rails/mocks/stub_model_spec.rb vendor/plugins/rspec-rails/spec/rails/sample_spec.rb vendor/plugins/rspec-rails/spec/rails/spec_server_spec.rb vendor/plugins/rspec-rails/spec/rails/spec_spec.rb vendor/plugins/rspec-rails/spec/rails_suite.rb vendor/plugins/rspec-rails/spec/spec_helper.rb vendor/plugins/rspec-rails/spec_resources/controllers/action_view_base_spec_controller.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/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/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/render_spec/_a_partial.rhtml vendor/plugins/rspec-rails/spec_resources/views/render_spec/some_action.js.rjs vendor/plugins/rspec-rails/spec_resources/views/render_spec/some_action.rhtml 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/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/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/stories/all.rb vendor/plugins/rspec-rails/stories/helper.rb vendor/plugins/rspec-rails/stories/steps/people.rb vendor/plugins/rspec-rails/stories/transactions_should_rollback vendor/plugins/rspec-rails/stories/transactions_should_rollback.rb vendor/plugins/rspec-rails/tasks/rspec.rake vendor/plugins/rspec/.autotest vendor/plugins/rspec/.gitignore vendor/plugins/rspec/TODO vendor/plugins/rspec/examples/pure/autogenerated_docstrings_example.rb vendor/plugins/rspec/examples/pure/before_and_after_example.rb vendor/plugins/rspec/examples/pure/behave_as_example.rb vendor/plugins/rspec/examples/pure/custom_expectation_matchers.rb vendor/plugins/rspec/examples/pure/custom_formatter.rb vendor/plugins/rspec/examples/pure/dynamic_spec.rb vendor/plugins/rspec/examples/pure/file_accessor.rb vendor/plugins/rspec/examples/pure/file_accessor_spec.rb vendor/plugins/rspec/examples/pure/greeter_spec.rb vendor/plugins/rspec/examples/pure/helper_method_example.rb vendor/plugins/rspec/examples/pure/io_processor.rb vendor/plugins/rspec/examples/pure/io_processor_spec.rb vendor/plugins/rspec/examples/pure/legacy_spec.rb vendor/plugins/rspec/examples/pure/mocking_example.rb vendor/plugins/rspec/examples/pure/multi_threaded_behaviour_runner.rb vendor/plugins/rspec/examples/pure/nested_classes_example.rb vendor/plugins/rspec/examples/pure/partial_mock_example.rb vendor/plugins/rspec/examples/pure/pending_example.rb vendor/plugins/rspec/examples/pure/predicate_example.rb vendor/plugins/rspec/examples/pure/priority.txt vendor/plugins/rspec/examples/pure/shared_example_group_example.rb vendor/plugins/rspec/examples/pure/shared_stack_examples.rb vendor/plugins/rspec/examples/pure/spec_helper.rb vendor/plugins/rspec/examples/pure/stack.rb vendor/plugins/rspec/examples/pure/stack_spec.rb vendor/plugins/rspec/examples/pure/stack_spec_with_nested_example_groups.rb vendor/plugins/rspec/examples/pure/stubbing_example.rb vendor/plugins/rspec/examples/stories/adder.rb vendor/plugins/rspec/examples/stories/addition vendor/plugins/rspec/examples/stories/addition.rb vendor/plugins/rspec/examples/stories/calculator.rb vendor/plugins/rspec/examples/stories/game-of-life/.loadpath vendor/plugins/rspec/examples/stories/game-of-life/README.txt vendor/plugins/rspec/examples/stories/game-of-life/behaviour/everything.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/examples.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/game_behaviour.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/grid_behaviour.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/CellsWithLessThanTwoNeighboursDie.story vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/CellsWithMoreThanThreeNeighboursDie.story vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/EmptySpacesWithThreeNeighboursCreateACell.story vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/ICanCreateACell.story vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/ICanKillACell.story vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/TheGridWraps.story vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/create_a_cell.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/helper.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/kill_a_cell.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/steps.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/stories.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/stories.txt vendor/plugins/rspec/examples/stories/game-of-life/life.rb vendor/plugins/rspec/examples/stories/game-of-life/life/game.rb vendor/plugins/rspec/examples/stories/game-of-life/life/grid.rb vendor/plugins/rspec/examples/stories/helper.rb vendor/plugins/rspec/examples/stories/steps/addition_steps.rb vendor/plugins/rspec/failing_examples/README.txt vendor/plugins/rspec/failing_examples/failing_autogenerated_docstrings_example.rb vendor/plugins/rspec/lib/spec/example.rb vendor/plugins/rspec/lib/spec/example/configuration.rb vendor/plugins/rspec/lib/spec/example/errors.rb vendor/plugins/rspec/lib/spec/example/example_group.rb vendor/plugins/rspec/lib/spec/example/example_group_factory.rb vendor/plugins/rspec/lib/spec/example/example_group_methods.rb vendor/plugins/rspec/lib/spec/example/example_matcher.rb vendor/plugins/rspec/lib/spec/example/example_methods.rb vendor/plugins/rspec/lib/spec/example/module_inclusion_warnings.rb vendor/plugins/rspec/lib/spec/example/module_reopening_fix.rb vendor/plugins/rspec/lib/spec/example/pending.rb vendor/plugins/rspec/lib/spec/example/shared_example_group.rb vendor/plugins/rspec/lib/spec/extensions/class.rb vendor/plugins/rspec/lib/spec/extensions/metaclass.rb vendor/plugins/rspec/lib/spec/interop/test.rb vendor/plugins/rspec/lib/spec/interop/test/unit/autorunner.rb vendor/plugins/rspec/lib/spec/interop/test/unit/testcase.rb vendor/plugins/rspec/lib/spec/interop/test/unit/testresult.rb vendor/plugins/rspec/lib/spec/interop/test/unit/testsuite_adapter.rb vendor/plugins/rspec/lib/spec/interop/test/unit/ui/console/testrunner.rb vendor/plugins/rspec/lib/spec/matchers/exist.rb vendor/plugins/rspec/lib/spec/runner/class_and_arguments_parser.rb vendor/plugins/rspec/lib/spec/runner/example_group_runner.rb vendor/plugins/rspec/lib/spec/runner/formatter/failing_example_groups_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/profile_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/text_mate_formatter.rb vendor/plugins/rspec/lib/spec/story/extensions/regexp.rb vendor/plugins/rspec/lib/spec/story/extensions/string.rb vendor/plugins/rspec/lib/spec/story/runner/plain_text_story_runner.rb vendor/plugins/rspec/lib/spec/story/runner/story_mediator.rb vendor/plugins/rspec/lib/spec/story/runner/story_parser.rb vendor/plugins/rspec/lib/spec/story/step.rb vendor/plugins/rspec/lib/spec/story/step_group.rb vendor/plugins/rspec/spec/autotest_matchers.rb vendor/plugins/rspec/spec/ruby_forker.rb vendor/plugins/rspec/spec/spec.opts vendor/plugins/rspec/spec/spec/example/configuration_spec.rb vendor/plugins/rspec/spec/spec/example/example_group/described_module_spec.rb vendor/plugins/rspec/spec/spec/example/example_group/warning_messages_spec.rb vendor/plugins/rspec/spec/spec/example/example_group_class_definition_spec.rb vendor/plugins/rspec/spec/spec/example/example_group_factory_spec.rb vendor/plugins/rspec/spec/spec/example/example_group_methods_spec.rb vendor/plugins/rspec/spec/spec/example/example_group_spec.rb vendor/plugins/rspec/spec/spec/example/example_matcher_spec.rb vendor/plugins/rspec/spec/spec/example/example_methods_spec.rb vendor/plugins/rspec/spec/spec/example/example_runner_spec.rb vendor/plugins/rspec/spec/spec/example/example_spec.rb vendor/plugins/rspec/spec/spec/example/nested_example_group_spec.rb vendor/plugins/rspec/spec/spec/example/pending_module_spec.rb vendor/plugins/rspec/spec/spec/example/predicate_matcher_spec.rb vendor/plugins/rspec/spec/spec/example/shared_example_group_spec.rb vendor/plugins/rspec/spec/spec/example/subclassing_example_group_spec.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_that_fails.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_that_passes.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_with_errors.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/test_case_that_fails.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/test_case_that_passes.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/test_case_with_errors.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/testsuite_adapter_spec_with_test_unit.rb vendor/plugins/rspec/spec/spec/interop/test/unit/spec_spec.rb vendor/plugins/rspec/spec/spec/interop/test/unit/test_unit_spec_helper.rb vendor/plugins/rspec/spec/spec/interop/test/unit/testcase_spec.rb vendor/plugins/rspec/spec/spec/interop/test/unit/testsuite_adapter_spec.rb vendor/plugins/rspec/spec/spec/mocks/bug_report_10263_spec.rb vendor/plugins/rspec/spec/spec/mocks/bug_report_15719_spec.rb vendor/plugins/rspec/spec/spec/mocks/hash_including_matcher_spec.rb vendor/plugins/rspec/spec/spec/runner/class_and_argument_parser_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/failing_example_groups_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6-jruby.html vendor/plugins/rspec/spec/spec/runner/formatter/profile_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.4.html vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture.rb vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture_runner.rb vendor/plugins/rspec/spec/spec/runner/output_one_time_spec.rb vendor/plugins/rspec/spec/spec/runner/resources/a_bar.rb vendor/plugins/rspec/spec/spec/runner/resources/a_foo.rb vendor/plugins/rspec/spec/spec/runner/resources/a_spec.rb vendor/plugins/rspec/spec/spec/runner/spec_drb.opts vendor/plugins/rspec/spec/spec/runner/spec_parser/spec_parser_fixture.rb vendor/plugins/rspec/spec/spec/story/extensions/main_spec.rb vendor/plugins/rspec/spec/spec/story/runner/plain_text_story_runner_spec.rb vendor/plugins/rspec/spec/spec/story/runner/story_mediator_spec.rb vendor/plugins/rspec/spec/spec/story/runner/story_parser_spec.rb vendor/plugins/rspec/spec/spec/story/step_group_spec.rb vendor/plugins/rspec/spec/spec/story/step_spec.rb vendor/plugins/rspec/stories/all.rb vendor/plugins/rspec/stories/example_groups/autogenerated_docstrings vendor/plugins/rspec/stories/example_groups/example_group_with_should_methods vendor/plugins/rspec/stories/example_groups/nested_groups vendor/plugins/rspec/stories/example_groups/output vendor/plugins/rspec/stories/example_groups/stories.rb vendor/plugins/rspec/stories/helper.rb vendor/plugins/rspec/stories/interop/examples_and_tests_together vendor/plugins/rspec/stories/interop/stories.rb vendor/plugins/rspec/stories/interop/test_case_with_should_methods vendor/plugins/rspec/stories/pending_stories/README vendor/plugins/rspec/stories/resources/helpers/cmdline.rb vendor/plugins/rspec/stories/resources/helpers/story_helper.rb vendor/plugins/rspec/stories/resources/matchers/smart_match.rb vendor/plugins/rspec/stories/resources/spec/example_group_with_should_methods.rb vendor/plugins/rspec/stories/resources/spec/simple_spec.rb vendor/plugins/rspec/stories/resources/steps/running_rspec.rb vendor/plugins/rspec/stories/resources/stories/failing_story.rb vendor/plugins/rspec/stories/resources/test/spec_and_test_together.rb vendor/plugins/rspec/stories/resources/test/test_case_with_should_methods.rb vendor/plugins/rspec/story_server/prototype/javascripts/builder.js vendor/plugins/rspec/story_server/prototype/javascripts/controls.js vendor/plugins/rspec/story_server/prototype/javascripts/dragdrop.js vendor/plugins/rspec/story_server/prototype/javascripts/effects.js vendor/plugins/rspec/story_server/prototype/javascripts/prototype.js vendor/plugins/rspec/story_server/prototype/javascripts/rspec.js vendor/plugins/rspec/story_server/prototype/javascripts/scriptaculous.js vendor/plugins/rspec/story_server/prototype/javascripts/slider.js vendor/plugins/rspec/story_server/prototype/javascripts/sound.js vendor/plugins/rspec/story_server/prototype/javascripts/unittest.js vendor/plugins/rspec/story_server/prototype/lib/server.rb vendor/plugins/rspec/story_server/prototype/stories.html vendor/plugins/rspec/story_server/prototype/stylesheets/rspec.css vendor/plugins/rspec/story_server/prototype/stylesheets/test.css @@ -1,4 +1,99 @@ -== Version 1.0.9 (in SVN) +== Version 1.1.4 (trunk) + +Maintenance release. + +Note: we've removed the metaclass method from Object. There were some +generated specs that used it, and they will now break. Just replace the +metaclass call with (class << self; self; end) and all will be well. + +* Setting mock_model object id with stubs hash - patch from Adam Meehan +* pending steps print out yellow in stories (patch from Kyle Hargraves) +* Deprecation warnings for specs that assume auto-inclusion of modules. Closes #326 (patch from Scott Taylor) +* mock.should_not_receive(:anything) fails fast (once again) +* Added as_new_record to stub_model e.g. stub_model(Foo).as_new_record +* Improved stub_model such that new_record? does "the right thing" +* Patch from Pat Maddox to get integrate_views to work in nested example groups. +* Patch from Pat Maddox to get controller_name to work in nested example groups. +* Patch from Corey Haines to add include_text matcher (rspec_on_rails) +* Patch from Antti Tarvainen to stop files from being loaded repeatedly when running heckle. Closes #333. +* Fixed bug in which session object in example was not the same instance used in the controller. Closes #331. +* Added stub_model method which creates a real model instance with :id stubbed and data access prohibited. +* Applied patch from Antti Tarvainen to fix bug where heckle runs rspec runs heckle runs rspec etc. Closes #280. +* Applied patch from Zach Dennis to merge :steps functionality to :steps_for. Closes #324. +* Applied patch from Pat Maddox to handle redirect_to w/ SSL. Closes #320. +* Applied patch from Ryan Davis to add eval of block passed to raise_error matcher. Closes #321. +* alias :context :describe in example_group_methods. Closes #312. +* Applied patch from Ben Mabey to make the Story runner exit with a non-0 exit code on failing stories. Closes #228. +* Added #helper and #assigns to helper specs. +* Applied patch from Bryan Helmkamp to tweak format of generated spec.opts to be more obvious. Closes #162. +* Tweaked list of exceptions (ignores) for autotest with rspec_on_rails. +* Applied patch from Coda Hale to get the :red hook called in autotest. Closes #279. +* Applied patch from Patrick Ritchie to support --drb in spec.opts. Closes #274, #293. +* Applied patch from Rick Olson to get rspec_on_rails working with rails edge (>= 8862) +* Moved metaclass method from Object to an internal module which gets included where it is needed. +* Applied patch from Dayo Esho: and_yield clobbers return value from block. Closes #217. +* Applied patch from Bob Cotton: ExampleGroupFactory.default resets previously registered types. Closes #222. +* Applied patch from Mike Williams to support the lib directory in rails apps with the Textmate Alternate File command. Closes #276. +* ExampleGroupMethods#xspecify aliases #xit +* A SharedExampleGroup can be created within another ExampleGroup. +* Applied patch from Bob Cotton: Nested ExampleGroups do not have a spec_path. Closes #224. +* Applied patch from Wincent Colaiuta to invert sense of "spec --diff". Closes #281. +* Allow any type of render in view specs. Closes #57. +* Applied patch from Ian White to get rspec working with edge rails (8804). Closes #271. + +== Version 1.1.3 + +Maintenance release. +Notice to autotest users: you must also upgrade to ZenTest-3.9.0. + +* Tightened up exceptions list in autotest/rails_spec. Closes #264. +* Applied patch from Ryan Davis for ZenTest-3.9.0 compatibility +* Applied patch from Kero to add step_upcoming to story listeners. Closes #253. +* Fixed bug where the wrong named error was not always caught by "should raise_error" +* Applied patch from Luis Lavena: No coloured output on Windows due missing RUBYOPT. Closes #244. +* Applied patch from Craig Demyanovich to add support for "should_not render_template" to rspec_on_rails. Closes #241. +* Added --pattern (-p for short) option to control what files get loaded. Defaults to '**/*_spec.rb' +* Exit with non-0 exit code if examples *or tests* (in test/unit interop mode) fail. Closes #203. +* Moved at_exit hook to a method in Spec::Runner which only runs if specs get loaded. Closes #242. +* Applied patch from kakutani ensuring that base_view_path gets cleared after each view example. Closes #235. +* More tweaks to regexp step names +* Fixed focused specs in nested ExampleGroups. Closes #225. + +== Version 1.1.2 + +Minor bug fixes/enhancements. +Notice to autotest users: you must also upgrade to ZenTest-3.8.0. + +* RSpec's Autotest subclasses compatible with ZenTest-3.8.0 (thanks to Ryan Davis for making it easier on Autotest subs). +* Applied patch from idl to add spec/lib to rake stats. Closes #226. +* calling setup_fixtures and teardown_fixtures for Rails >= r8570. Closes #219. +* Applied patch from Josh Knowles using ActiveSupport's Inflector (when available) to make 'should have' read a bit better. Closes #197. +* Fixed regression in 1.1 that caused failing examples to fail to generate their own names. Closes #209. +* Applied doc patch from Jens Krämer for capturing content_for +* Applied patch from Alexander Lang to clean up story steps after each story. Closes #198. +* Applied patch from Josh Knowles to support 'string_or_response.should have_text(...)'. Closes #193. +* Applied patch from Ian Dees to quiet the Story Runner backtrace. Closes #183. +* Complete support for defining steps with regexp 'names'. + +== Version 1.1.1 + +Bug fix release. + +* Fix regression in 1.1.0 that caused transactions to not get rolled back between examples. +* Applied patch from Bob Cotton to reintroduce ExampleGroup.description_options. Closes LH[#186] + +== Version 1.1.0 + +The "tell me a story and go nest yourself" release. + +* Applied patch from Mike Vincent to handle generators rails > 2.0.1. Closes LH[#181] +* Formatter.pending signature changed so it gets passed an ExampleGroup instance instead of the name ( LH[#180]) +* Fixed LH[#180] Spec::Rails::Example::ModelExampleGroup and friends show up in rspec/rails output +* Spec::Rails no longer loads ActiveRecord extensions if it's disabled in config/boot.rb +* Applied LH[#178] small annoyances running specs with warnings enabled (Patch from Mikko Lehtonen) +* Tighter integration with Rails fixtures. Take advantage of fixture caching to get performance improvements (Thanks to Pat Maddox, Nick Kallen, Jonathan Barnes, and Curtis) + +== Version 1.1.0-RC1 Textmate Bundle users - this release adds a new RSpec bundle that highlights describe, it, before and after and provides navigation to descriptions and examples (rather than classes and methods). When you first install this, @@ -13,6 +108,40 @@ CMD-R runs all the specs in one file CMD-SHIFT-R runs an individual spec CMD-OPT-R runs any files or directories selected in the TextMate drawer +rspec_on_rails users - don't forget to run script/generate rspec + +* Added shared_examples_for method, which you can (should) use instead of describe Foo, :shared => true +* Applied LH[#168] Fix describe Object, "description contains a # in it" (Patch from Martin Emde) +* Applied LH[#15] Reverse loading of ActionView::Base helper modules (Patch from Mark Van Holstyn) +* Applied LH[#149] Update contribute page to point towards lighthouse (Patch from Josh Knowles) +* Applied LH[#142] verify_rcov fails with latest rcov (Patch from Kyle Hargraves) +* Applied LH[#10] Allow stubs to yield and return values (Patch from Pat Maddox) +* Fixed LH[#139] version.rb in trunk missing svn last changed number +* Applied LH[#14] Adding support for by_at_least/by_at_most in Change matcher (Patch from Saimon Moore) +* Applied LH[#12] Fix for TM when switching to alternate file (Patch from Trevor Squires) +* Applied LH[#133] ExampleMatcher should match against before(:all) (Patch from Bob Cotton) +* Applied LH[#134] Only load spec inside spec_helper.rb (Patch from Mark Van Holstyn) +* RSpec now bails immediately if there are examples with identical names. +* Applied LH[#132] Plain Text stories should support Given and Given: (Patch from Jarkko Laine) +* Applied patch from Pat Maddox: Story Mediator - the glue that binds the plain text story parser with the rest of the system +* Applied LH[#16] Have SimpleMatchers expose their description for specdocs (Patch from Bryan Helmkamp) +* Stories now support --colour +* Changed the DSL modules to Example (i.e. Spec::Example instead of Spec::DSL) +* Applied [#15608] Story problem if parenthesis used in Given, When, Then or And (Patch from Sinclair Bain) +* Applied [#15659] GivenScenario fails when it is a RailsStory (Patch from Nathan Sutton) +* Fixed [#15639] rcov exclusion configuration. (Spec::Rails projects can configure rcov with spec/rcov.opts) +* The rdoc formatter (--format rdoc) is gone. It was buggy and noone was using it. +* Changed Spec::DSL::Behaviour to Spec::DSL::ExampleGroup +* Changed Spec::DSL::SharedBehaviour to Spec::DSL::SharedExampleGroup +* Applied [#14023] Small optimization for heavily proxied objects. (Patch from Ian Leitch) +* Applied [#13943] ProfileFormatter (Top 10 slowest examples) (Patch from Ian Leitch) +* Fixed [#15232] heckle is not working correctly in trunk (as of r2801) +* Applied [#14399] Show pending reasons in HTML report (Patch from Bryan Helmkamp) +* Discovered fixed: [#10263] mock "leak" when setting an expectation in a block passed to mock#should_receive +* Fixed [#14671] Spec::DSL::ExampleRunner gives "NO NAME because of --dry-run" for every example for 'rake spec:doc' +* Fixed [#14543] rspec_scaffold broken with Rails 2.0 +* Removed Patch [#10577] Rails with Oracle breaks 0.9.2 - was no longer necessary since we moved describe to the Main object (instead of Object) +* Fixed [#14527] specs run twice on rails 1.2.4 and rspec/rspec_on_rails trunk * Applied [#14043] Change output ordering to show pending before errors (Patch from Mike Mangino) * Applied [#14095] Don't have ./script/generate rspec create previous_failures.txt (Patch from Bryan Helmkamp) * Applied [#14254] Improved error handling for Object#should and Object#should_not (Patch from Antti Tarvainen) @@ -132,7 +261,7 @@ able to use the passed Example instance as if it were a String. * Fixed [#12079] auto-generated example name incomplete: should have 1 error on ....] * Applied [#12066] Docfix for mocks/mocks.page (Patch from Kyle Hargraves) * Fixed [#11891] script/generate rspec_controller fails to create appropriate views (from templates) on edge rails -* Applied [#11921] Adds the correct controller_name from derived_controller_name() to the ViewExampleController (Patch from Eloy Duran) +* Applied [#11921] Adds the correct controller_name from derived_controller_name() to the ViewExampleGroupController (Patch from Eloy Duran) * Fixed [#11903] config.include with behaviour_type 'hash' does not work * Examples without blocks and pending is now reported with a P instead of a * * Pending blocks that now pass are rendered blue vendor/plugins/rspec/CHANGES @@ -1,4 +1,4 @@ -Copyright (c) 2005-2007 The RSpec Development Team +Copyright (c) 2005-2008 The RSpec Development Team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the vendor/plugins/rspec/MIT-LICENSE @@ -1,11 +1,13 @@ == RSpec -RSpec is a Behaviour Definition Framework intended for use in Behaviour -Driven Development. RSpec plays the same role that a unit testing framework -would play in a Test Driven Development environment, but does so using -words and structures that better support BDD. +RSpec is a Behaviour Driven Development framework with tools to express User Stories +with Executable Scenarios and Executable Examples at the code level. -RSpec ships with four modules: +RSpec ships with several modules: + +Spec::Story provides a framework for expressing User Stories and Scenarios + +Spec::Example provides a framework for expressing Isolated Examples Spec::Matchers provides Expression Matchers for use with Spec::Expectations and Spec::Mocks. @@ -18,58 +20,17 @@ can do things like: Spec::Mocks supports creating Mock Objects, Stubs, and adding Mock/Stub behaviour to your existing objects. -Spec::Runner provides a very small but powerful DSL for writing executable -examples of how your code should work. - -Spec::Story provides a framework for expressing User Stories - == Installation -The simplest approach is to install the gem: +The simplest approach is to install the gem (as root in some environments): - gem install -r rspec #mac users must sudo + gem install -r rspec == Building the RSpec gem -If you prefer to build the gem locally, check out source from svn://rubyforge.org/var/svn/rspec/trunk. Then -do the following: - - rake gem - gem install pkg/rspec-0.x.x.gem (you may have to sudo) - -== Running RSpec's specs -In order to run RSpec's full suite of specs (rake pre_commit) you must install the following gems: -* rake # Runs the build script -* rcov # Verifies that the code is 100% covered by specs -* webgen # Generates the static HTML website -* RedCloth # Required by webgen -* syntax # Required by our own custom webgen extension to highlight ruby code -* diff-lcs # Required if you use the --diff switch -* win32console # Required by the --colour switch if you're on Windows -* meta_project # Required in order to make releases at RubyForge -* heckle # Required if you use the --heckle switch -* hpricot # Used for parsing HTML from the HTML output formatter in RSpec's own specs - -Once those are all installed, you should be able to run the suite with the following steps: - -* svn co svn://rubyforge.org/var/svn/rspec/trunk rspec -* cd rspec -* rake install_dependencies -* cd example_rails_app -* export RSPEC_RAILS_VERSION=1.2.3 -* rake rspec:generate_mysql_config -* mysql -u root < db/mysql_setup.sql -* cd .. -* rake pre_commit - -Note that RSpec itself - once built - doesn't have any dependencies outside the Ruby core -and stdlib - with a few exceptions: - -* The spec command line uses diff-lcs when --diff is specified. -* The spec command line uses heckle when --heckle is specified. -* The Spec::Rake::SpecTask needs RCov if RCov is enabled in the task. - -See http://rspec.rubyforge.org for further documentation. - -== Contributing +If you prefer to build the gem locally: + git clone git://github.com/dchelimsky/rspec.git + cd rspec + rake gem + gem install pkg/rspec-0.x.x.gem #as root vendor/plugins/rspec/README @@ -4,14 +4,12 @@ require 'rake/gempackagetask' require 'rake/contrib/rubyforgepublisher' require 'rake/clean' require 'rake/rdoctask' +require 'rake/testtask' require 'spec/version' dir = File.dirname(__FILE__) -$LOAD_PATH.unshift(File.expand_path("#{dir}/../pre_commit/lib")) -require "pre_commit" # 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_rdoc.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' @@ -22,40 +20,41 @@ PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" PKG_FILES = FileList[ '[A-Z]*', 'lib/**/*.rb', - 'spec/**/*.rb', + 'spec/**/*', 'examples/**/*', - 'plugins/**/*' + 'failing_examples/**/*', + 'plugins/**/*', + 'stories/**/*', + 'rake_tasks/**/*' ] -FileUtils.touch(File.dirname(__FILE__) + '/previous_failures.txt') task :default => [:verify_rcov] +task :verify_rcov => [:spec, :stories] desc "Run all specs" Spec::Rake::SpecTask.new do |t| t.spec_files = FileList['spec/**/*_spec.rb'] - t.spec_opts = ['--options', 'spec.opts'] - t.rcov = true - t.rcov_dir = '../doc/output/coverage' - t.rcov_opts = ['--exclude', 'spec\/spec,bin\/spec,examples,\/var\/lib\/gems'] + t.spec_opts = ['--options', 'spec/spec.opts'] + unless ENV['NO_RCOV'] + t.rcov = true + t.rcov_dir = '../doc/output/coverage' + t.rcov_opts = ['--exclude', 'spec\/spec,bin\/spec,examples,\/var\/lib\/gems,\/Library\/Ruby,\.autotest'] + end end -desc "Run all translated specs" -Spec::Rake::SpecTask.new('translated_specs') do |t| - t.spec_files = FileList['translated_specs/**/*_spec.rb'].exclude( # These translate, but have other quirks - 'translated_specs/spec/translator_spec.rb', - 'translated_specs/spec/runner/formatter/html_formatter_spec.rb', - 'translated_specs/spec/runner/option_parser_spec.rb' - ) - t.spec_opts = ['--options', 'spec.opts'] - t.rcov = true - t.rcov_dir = '../doc/output/coverage' - t.rcov_opts = ['--exclude', 'spec\/spec,bin\/spec,examples'] +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', 'vendor/RSpec.tmbundle/Support/spec/*_spec.rb'] - t.spec_opts = ['--format html:../doc/output/report.html','--backtrace'] + t.spec_files = FileList['spec/**/*_spec.rb'] + t.spec_opts = ['--format html:../../../../doc/output/report.html','--backtrace'] end desc "Run all failing examples" @@ -63,21 +62,13 @@ Spec::Rake::SpecTask.new('failing_examples') do |t| t.spec_files = FileList['failing_examples/**/*_spec.rb'] end -desc 'Generate HTML documentation for website' -task :webgen do - core.webgen -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', 'EXAMPLES.rd', 'UPGRADE', 'lib/**/*.rb') + rdoc.rdoc_files.include('README', 'CHANGES', 'MIT-LICENSE', 'UPGRADE', 'lib/**/*.rb') end -desc "Generate EXAMPLES.rb" -task(:rdoc) {core.rdoc} - spec = Gem::Specification.new do |s| s.name = PKG_NAME s.version = PKG_VERSION @@ -96,13 +87,13 @@ spec = Gem::Specification.new do |s| s.rdoc_options = rd.options s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$|^EXAMPLES.rd$/ }.to_a - s.autorequire = 'spec' s.bindir = 'bin' s.executables = ['spec', 'spec_translator'] 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 @@ -134,7 +125,7 @@ task :clobber do core.clobber end -task :release => [:clobber, :verify_committed, :verify_user, :spec, :publish_packages, :tag, :publish_website, :publish_news] +task :release => [:clobber, :verify_committed, :verify_user, :spec, :publish_packages, :tag, :publish_news] desc "Verifies that there is no uncommitted code" task :verify_committed do @@ -164,14 +155,6 @@ task :tag do `#{create_current_cmd}` ; "ERROR: #{create_current_cmd}" unless $? == 0 end -desc "Run this task before you commit. You should see 'OK TO COMMIT'" -task(:pre_commit) {core.pre_commit} - -desc "Build the website, but do not publish it" -task(:website) {core.website} - -task(:rdoc_rails) {core.rdoc_rails} - task :verify_user do raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER'] end @@ -203,10 +186,10 @@ end desc "Package the Rails plugin" task :package_rspec_on_rails do mkdir 'pkg' rescue nil - rm_rf 'pkg/rspec_on_rails' rescue nil - `svn export ../rspec_on_rails pkg/rspec_on_rails-#{PKG_VERSION}` + rm_rf 'pkg/rspec-rails' rescue nil + `svn export ../rspec-rails pkg/rspec_on_rails-#{PKG_VERSION}` Dir.chdir 'pkg' do - `tar cvzf rspec_on_rails-#{PKG_VERSION}.tgz rspec_on_rails-#{PKG_VERSION}` + `tar cvzf rspec-rails-#{PKG_VERSION}.tgz rspec-rails-#{PKG_VERSION}` end end task :pkg => :package_rspec_on_rails @@ -224,14 +207,12 @@ 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] do - require File.dirname(__FILE__) + '/../spec_ui/lib/spec/ui/version' release_files = FileList[ "pkg/#{PKG_FILE_NAME}.gem", "pkg/#{PKG_FILE_NAME}.tgz", - "pkg/rspec_on_rails-#{PKG_VERSION}.tgz", + "pkg/rspec-rails-#{PKG_VERSION}.tgz", "pkg/#{PKG_FILE_NAME}.zip", - "pkg/RSpec-#{PKG_VERSION}.tmbundle.tgz", - "../spec_ui/pkg/spec_ui-#{Spec::Ui::VERSION::STRING}.gem" + "pkg/RSpec-#{PKG_VERSION}.tmbundle.tgz" ] unless Spec::VERSION::RELEASE_CANDIDATE require 'meta_project' vendor/plugins/rspec/Rakefile @@ -1,29 +1,5 @@ -= Upgrading existing code to RSpec-0.9 - -== General (see below for Spec::Rails specifics) - -=== New Syntax for should and should_not - -* Use translator (should get 90% of your code) -* Manually fix "parenthesis" warnings - -=== Change before_context_eval to before_eval - -before_context_eval is an un-published hook used by -Spec::Rails to create specialized behaviour contexts. -Most of you don't need to change this, but for those -who have exploited it, you'll need to change it to -before_eval. - == Spec::Rails -=== spec_helper.rb - -We've added a new way to configure Spec::Runner to do -things like use_transactional_fixtures and use_instantiated_fixtures. -You'll need to update spec/spec_helper.rb accordingly. You can either -just re-generate it: - script/generate rspec Or modify spec_helper.rb based on the template, which can be found at: vendor/plugins/rspec/UPGRADE @@ -1,3 +1,4 @@ +#!/usr/bin/env ruby $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib")) require 'spec' -exit ::Spec::Runner::CommandLine.run(ARGV, STDERR, STDOUT) +exit ::Spec::Runner::CommandLine.run(rspec_options) vendor/plugins/rspec/bin/spec @@ -4,7 +4,7 @@ class BddFramework def intuitive? true end - + def adopted_quickly? #this will cause failures because it reallly SHOULD be adopted quickly false @@ -21,7 +21,7 @@ describe "BDD framework" do #this will fail because it reallly SHOULD be adopted quickly @bdd_framework.should be_adopted_quickly end - + it "should be intuitive" do @bdd_framework.should be_intuitive end vendor/plugins/rspec/failing_examples/predicate_example.rb @@ -1 +1,3 @@ -require File.dirname(__FILE__) + '/../lib/spec' +lib_path = File.expand_path("#{File.dirname(__FILE__)}/../lib") +$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path) +require "spec" vendor/plugins/rspec/failing_examples/spec_helper.rb @@ -1,3 +1,9 @@ -if ENV['RAILS_ENV'] == 'test' - require 'spec' -end +# Placeholder to satisfy Rails. +# +# Do NOT add any require statements to this file. Doing +# so will cause Rails to load this plugin all of the time. +# +# Running 'ruby script/generate rspec' will +# generate spec/spec_helper.rb, which includes the necessary +# require statements and configuration. This file should +# be required by all of your spec files. \ No newline at end of file vendor/plugins/rspec/init.rb @@ -1,85 +1,63 @@ require 'autotest' +Autotest.add_hook :initialize do |at| + at.clear_mappings + # watch out: Ruby bug (1.8.6): + # %r(/) != /\// + at.add_mapping(%r%^spec/.*\.rb$%) { |filename, _| + filename + } + at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m| + ["spec/#{m[1]}_spec.rb"] + } + at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) { + at.files_matching %r%^spec/.*_spec\.rb$% + } +end + class RspecCommandError < StandardError; end class Autotest::Rspec < Autotest - - def initialize(kernel=Kernel, separator=File::SEPARATOR, alt_separator=File::ALT_SEPARATOR) # :nodoc: - super() - @kernel, @separator, @alt_separator = kernel, separator, alt_separator - @spec_command = spec_command - # watch out: Ruby bug (1.8.6): - # %r(/) != /\// - # since Ruby compares the REGEXP source, not the resulting pattern - @test_mappings = { - %r%^spec/.*\.rb$% => kernel.proc { |filename, _| - filename - }, - %r%^lib/(.*)\.rb$% => kernel.proc { |_, m| - ["spec/#{m[1]}_spec.rb"] - }, - %r%^spec/(spec_helper|shared/.*)\.rb$% => kernel.proc { - files_matching %r%^spec/.*_spec\.rb$% - } - } - end - - def tests_for_file(filename) - super.select { |f| @files.has_key? f } + def initialize + super + self.failed_results_re = /^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m + self.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m end - alias :specs_for_file :tests_for_file - - def failed_results(results) - results.scan(/^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m) - end - - def handle_results(results) - @files_to_test = consolidate_failures failed_results(results) - unless @files_to_test.empty? then - hook :red - else - hook :green - end unless $TESTING - @tainted = true unless @files_to_test.empty? - end - def consolidate_failures(failed) - filters = Hash.new { |h,k| h[k] = [] } - failed.each do |spec, failed_trace| - @files.keys.select{|f| f =~ /spec\//}.each do |f| - if failed_trace =~ Regexp.new(f) - filters[f] << spec - break - end + filters = new_hash_of_arrays + failed.each do |spec, trace| + if trace =~ /\n(\.\/)?(.*\.rb):[\d]+:\Z?/ + filters[$2] << spec end end return filters end def make_test_cmd(files_to_test) - return "#{ruby} -S #{@spec_command} #{add_options_if_present} #{files_to_test.keys.flatten.join(' ')}" + return "#{ruby} -S #{spec_command} #{add_options_if_present} #{files_to_test.keys.flatten.join(' ')}" end - def add_options_if_present + 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 - spec_commands.each do |command| - if File.exists?(command) - return @alt_separator ? (command.gsub @separator, @alt_separator) : command - 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 - - raise RspecCommandError, "No spec command could be found!" + @spec_command end - + # Autotest will look for spec commands in the following # locations, in this order: # @@ -87,9 +65,8 @@ class Autotest::Rspec < Autotest # * default spec bin/loader installed in Rubygems def spec_commands [ - File.join('bin', 'spec'), + 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,13 +1,30 @@ -require "test/unit" -require "test/unit/testresult" -require "test/unit/ui/testrunnermediator" - require 'spec/version' require 'spec/matchers' require 'spec/expectations' -require 'spec/translator' -require 'spec/dsl' +require 'spec/example' require 'spec/extensions' require 'spec/runner' -require 'spec/story' -require 'spec/test' + +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 vendor/plugins/rspec/lib/spec.rb @@ -17,7 +17,7 @@ module Spec end # This is snagged from diff/lcs/ldiff.rb (which is a commandline tool) - def diff_as_string(data_old, data_new) + def diff_as_string(data_new, data_old) data_old = data_old.split(/\n/).map! { |e| e.chomp } data_new = data_new.split(/\n/).map! { |e| e.chomp } output = "" vendor/plugins/rspec/lib/spec/expectations/differs/default.rb @@ -1,6 +1,12 @@ module Spec module Expectations - class ExpectationNotMetError < StandardError + # If Test::Unit is loaed, we'll use its error as baseclass, so that Test::Unit + # will report unmet RSpec expectations as failures rather than errors. + superclass = ['Test::Unit::AssertionFailedError', '::StandardError'].map do |c| + eval(c) rescue nil + end.compact.first + + class ExpectationNotMetError < superclass end end end vendor/plugins/rspec/lib/spec/expectations/errors.rb @@ -27,12 +27,8 @@ module Spec # # NOTE that this does NOT support receiver.should != expected. # Instead, use receiver.should_not == expected - def should(matcher = :default_parameter, &block) - if :default_parameter == matcher - Spec::Matchers::PositiveOperatorMatcher.new(self) - else - ExpectationMatcherHandler.handle_matcher(self, matcher, &block) - end + def should(matcher=:use_operator_matcher, &block) + ExpectationMatcherHandler.handle_matcher(self, matcher, &block) end # :call-seq: @@ -54,12 +50,8 @@ module Spec # => Passes unless (receiver =~ regexp) # # See Spec::Matchers for more information about matchers - def should_not(matcher = :default_parameter, &block) - if :default_parameter == matcher - Spec::Matchers::NegativeOperatorMatcher.new(self) - else - NegativeExpectationMatcherHandler.handle_matcher(self, matcher, &block) - end + def should_not(matcher=:use_operator_matcher, &block) + NegativeExpectationMatcherHandler.handle_matcher(self, matcher, &block) end end vendor/plugins/rspec/lib/spec/expectations/extensions/object.rb @@ -3,7 +3,7 @@ module Spec class InvalidMatcherError < ArgumentError; end module MatcherHandlerHelper - def describe(matcher) + def describe_matcher(matcher) matcher.respond_to?(:description) ? matcher.description : "[#{matcher.class.name} does not provide a description]" end end @@ -12,12 +12,16 @@ module Spec class << self include MatcherHandlerHelper def handle_matcher(actual, matcher, &block) + if :use_operator_matcher == matcher + return Spec::Matchers::PositiveOperatorMatcher.new(actual) + end + 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)}" + ::Spec::Matchers.generated_description = "should #{describe_matcher(matcher)}" Spec::Expectations.fail_with(matcher.failure_message) unless match end end @@ -27,6 +31,10 @@ module Spec 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 @@ -41,7 +49,7 @@ EOF ) end match = matcher.matches?(actual, &block) - ::Spec::Matchers.generated_description = "should not #{describe(matcher)}" + ::Spec::Matchers.generated_description = "should not #{describe_matcher(matcher)}" Spec::Expectations.fail_with(matcher.negative_failure_message) if match end end vendor/plugins/rspec/lib/spec/expectations/handler.rb @@ -1,2 +1,4 @@ require 'spec/extensions/object' +require 'spec/extensions/class' require 'spec/extensions/main' +require 'spec/extensions/metaclass' vendor/plugins/rspec/lib/spec/extensions.rb @@ -1,45 +1,100 @@ module Spec module Extensions module Main - # Creates and registers an instance of a Spec::DSL::Example (or a subclass). - # The instantiated behaviour class depends on the directory of the file + # Creates and returns a class that includes the ExampleGroupMethods + # module. Which ExampleGroup type is created depends on the directory of the file # calling this method. For example, Spec::Rails will use different - # classes for specs living in <tt>spec/models</tt>, <tt>spec/helpers</tt>, - # <tt>spec/views</tt> and <tt>spec/controllers</tt>. + # classes for specs living in <tt>spec/models</tt>, + # <tt>spec/helpers</tt>, <tt>spec/views</tt> and + # <tt>spec/controllers</tt>. # - # It is also possible to override autodiscovery of the behaviour class - # with an options Hash as the last argument: + # It is also possible to override autodiscovery of the example group + # type with an options Hash as the last argument: # - # describe "name", :behaviour_type => :something_special do ... + # describe "name", :type => :something_special do ... # - # The reason for using different behaviour classes is to have - # different matcher methods available from within the <tt>describe</tt> - # block. + # The reason for using different behaviour classes is to have different + # matcher methods available from within the <tt>describe</tt> block. # - # See Spec::DSL::ExampleFactory#add_example_class for details about - # how to register special Spec::DSL::Example implementations. + # See Spec::Example::ExampleFactory#register for details about how to + # register special implementations. # def describe(*args, &block) raise ArgumentError if args.empty? raise ArgumentError unless block args << {} unless Hash === args.last args.last[:spec_path] = caller(0)[1] - behaviour = Spec::DSL::BehaviourFactory.create(*args, &block) - behaviour.register - behaviour + Spec::Example::ExampleGroupFactory.create_example_group(*args, &block) end alias :context :describe - private + # Creates an example group that can be shared by other example groups + # + # == Examples + # + # 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 + def share_examples_for(name, &block) + describe(name, :shared => true, &block) + end + + alias :shared_examples_for :share_examples_for + + # Creates a Shared Example Group and assigns it to a constant + # + # 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 + def share_as(name, &block) + begin + Object.const_set(name, share_examples_for(name, &block)) + rescue NameError => e + raise NameError.new(e.message + "\nThe first argument to share_as must be a legal name for a constant\n") + end + end + private + def rspec_options - unless $rspec_options - parser = ::Spec::Runner::OptionParser.new(STDERR, STDOUT) - parser.parse(ARGV) - $rspec_options = parser.options + $rspec_options ||= begin; \ + parser = ::Spec::Runner::OptionParser.new(STDERR, STDOUT); \ + parser.order!(ARGV); \ + $rspec_options = parser.options; \ end $rspec_options end + + def init_rspec_options(options) + $rspec_options = options if $rspec_options.nil? + end end end end vendor/plugins/rspec/lib/spec/extensions/main.rb @@ -3,8 +3,4 @@ class Object options = Hash === args.last ? args.pop : {} return args, options end - - def metaclass - class << self; self; end - end end vendor/plugins/rspec/lib/spec/extensions/object.rb @@ -4,6 +4,7 @@ require 'spec/matchers/be_close' require 'spec/matchers/change' require 'spec/matchers/eql' require 'spec/matchers/equal' +require 'spec/matchers/exist' require 'spec/matchers/has' require 'spec/matchers/have' require 'spec/matchers/include' @@ -134,10 +135,12 @@ module Spec module Matchers module ModuleMethods attr_accessor :generated_description + def clear_generated_description - @generated_description = nil + self.generated_description = nil end end + extend ModuleMethods def method_missing(sym, *args, &block) # :nodoc: vendor/plugins/rspec/lib/spec/matchers.rb @@ -3,14 +3,17 @@ module Spec class Be #:nodoc: def initialize(*args) - @expected = parse_expected(args.shift) + if args.empty? + @expected = :satisfy_if + else + @expected = parse_expected(args.shift) + end @args = args @comparison = "" end def matches?(actual) @actual = actual - return true if match_or_compare unless handling_predicate? if handling_predicate? begin return @result = actual.__send__(predicate, *@args) @@ -28,8 +31,9 @@ module Spec rescue raise predicate_error end + else + return match_or_compare end - return false end def failure_message @@ -43,6 +47,7 @@ module Spec 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 @@ -50,6 +55,7 @@ module Spec 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 @@ -63,6 +69,7 @@ module Spec end def ==(expected) + @prefix = "be " @double_equal = true @comparison = "== " @expected = expected @@ -70,6 +77,7 @@ module Spec end def ===(expected) + @prefix = "be " @triple_equal = true @comparison = "=== " @expected = expected @@ -77,6 +85,7 @@ module Spec end def <(expected) + @prefix = "be " @less_than = true @comparison = "< " @expected = expected @@ -84,6 +93,7 @@ module Spec end def <=(expected) + @prefix = "be " @less_than_or_equal = true @comparison = "<= " @expected = expected @@ -91,6 +101,7 @@ module Spec end def >=(expected) + @prefix = "be " @greater_than_or_equal = true @comparison = ">= " @expected = expected @@ -98,6 +109,7 @@ module Spec end def >(expected) + @prefix = "be " @greater_than = true @comparison = "> " @expected = expected @@ -112,11 +124,14 @@ module Spec def parse_expected(expected) if Symbol === expected @handling_predicate = true - ["be_an_","be_a_","be_"].each do |@prefix| - return "#{expected.to_s.sub(@prefix,"")}".to_sym if expected.starts_with?(@prefix) + ["be_an_","be_a_","be_"].each do |prefix| + if expected.starts_with?(prefix) + @prefix = prefix + return "#{expected.to_s.sub(@prefix,"")}".to_sym + end end end - @prefix = "be " + @prefix = "" return expected end @@ -169,6 +184,7 @@ module Spec end # :call-seq: + # should be # should be_true # should be_false # should be_nil @@ -177,7 +193,8 @@ module Spec # should_not be_arbitrary_predicate(*args) # # Given true, false, or nil, will pass if actual is - # true, false or nil (respectively). + # true, false or nil (respectively). Given no args means + # the caller should satisfy an if condition (to be or not to be). # # Predicates are any Ruby method that ends in a "?" and returns true or false. # Given be_ followed by arbitrary_predicate (without the "?"), RSpec will match @@ -189,6 +206,7 @@ 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 @@ -21,6 +21,8 @@ EOF return false if @from && (@from != @before) return false if @to && (@to != @after) return (@before + @amount == @after) if @amount + return ((@after - @before) >= @minimum) if @minimum + return ((@after - @before) <= @maximum) if @maximum return @before != @after end @@ -37,6 +39,10 @@ EOF "#{result} 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}" + elsif @minimum + "#{result} 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}" else "#{result} should have changed, but is still #{@before.inspect}" end @@ -59,6 +65,16 @@ EOF self end + def by_at_least(minimum) + @minimum = minimum + self + end + + def by_at_most(maximum) + @maximum = maximum + self + end + def to(to) @to = to self @@ -88,6 +104,14 @@ EOF # team.add_player(player) # }.should change(roster, :count).by(1) # + # lambda { + # team.add_player(player) + # }.should change(roster, :count).by_at_least(1) + # + # lambda { + # team.add_player(player) + # }.should change(roster, :count).by_at_most(1) + # # string = "string" # lambda { # string.reverse @@ -109,7 +133,7 @@ EOF # # == Warning # +should_not+ +change+ only supports the form with no subsequent calls to - # +be+, +to+ or +from+. + # +by+, +by_at_least+, +by_at_most+, +to+ or +from+. # # blocks passed to +should+ +change+ and +should_not+ +change+ # must use the <tt>{}</tt> form (<tt>do/end</tt> is not supported) vendor/plugins/rspec/lib/spec/matchers/change.rb @@ -8,24 +8,14 @@ module Spec end def matches?(target) - @target = target - begin - return target.send(predicate, *@args) - rescue => @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 - return false + target.send(predicate, *@args) end def failure_message - raise @error if @error "expected ##{predicate}(#{@args[0].inspect}) to return true, got false" end def negative_failure_message - raise @error if @error "expected ##{predicate}(#{@args[0].inspect}) to return false, got true" end vendor/plugins/rspec/lib/spec/matchers/has.rb @@ -17,6 +17,7 @@ module Spec def method_missing(sym, *args, &block) @collection_name = sym + @plural_collection_name = Inflector.pluralize(sym.to_s) if Object.const_defined?(:Inflector) @args = args @block = block self @@ -25,6 +26,8 @@ module Spec def matches?(collection_owner) if collection_owner.respond_to?(@collection_name) 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) elsif (collection_owner.respond_to?(:length) || collection_owner.respond_to?(:size)) collection = collection_owner else vendor/plugins/rspec/lib/spec/matchers/have.rb @@ -1,50 +1,66 @@ module Spec module Matchers - class RaiseError #:nodoc: - def initialize(error_or_message=Exception, message=nil) - if String === error_or_message - @expected_error = Exception - @expected_message = error_or_message + def initialize(error_or_message=Exception, message=nil, &block) + @block = block + case error_or_message + when String, Regexp + @expected_error, @expected_message = Exception, error_or_message else - @expected_error = error_or_message - @expected_message = message + @expected_error, @expected_message = error_or_message, message end end - + def matches?(proc) @raised_expected_error = false - @raised_other = false + @with_expected_message = false + @eval_block = false + @eval_block_passed = false begin proc.call rescue @expected_error => @actual_error - if @expected_message.nil? - @raised_expected_error = true - else - case @expected_message - when Regexp - if @expected_message =~ @actual_error.message - @raised_expected_error = true - else - @raised_other = true - end - else - if @expected_message == @actual_error.message - @raised_expected_error = true - else - @raised_other = true - end - end - end - rescue => @actual_error - @raised_other = true - ensure - return @raised_expected_error + @raised_expected_error = true + @with_expected_message = verify_message + rescue Exception => @actual_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 + + unless negative_expectation? + eval_block if @raised_expected_error && @with_expected_message && @block + end + ensure + return (@raised_expected_error && @with_expected_message) ? (@eval_block ? @eval_block_passed : true) : false + end + + def eval_block + @eval_block = true + begin + @block[@actual_error] + @eval_block_passed = true + rescue Exception => err + @actual_error = err + end + end + + def verify_message + case @expected_message + when nil + return true + when Regexp + return @expected_message =~ @actual_error.message + else + return @expected_message == @actual_error.message end end def failure_message - return "expected #{expected_error}#{actual_error}" if @raised_other || !@raised_expected_error + if @eval_block + return @actual_error.message + else + return "expected #{expected_error}#{actual_error}" + end end def negative_failure_message @@ -70,6 +86,11 @@ module Spec def actual_error @actual_error.nil? ? " but nothing was raised" : ", got #{@actual_error.inspect}" end + + def negative_expectation? + # YES - I'm a bad person... help me find a better way - ryand + caller.first(3).find { |s| s =~ /should_not/ } + end end # :call-seq: @@ -77,6 +98,10 @@ module Spec # should raise_error(NamedError) # should raise_error(NamedError, String) # should raise_error(NamedError, Regexp) + # should raise_error() { |error| ... } + # should raise_error(NamedError) { |error| ... } + # should raise_error(NamedError, String) { |error| ... } + # should raise_error(NamedError, Regexp) { |error| ... } # should_not raise_error() # should_not raise_error(NamedError) # should_not raise_error(NamedError, String) @@ -86,11 +111,13 @@ module Spec # With a named error, matches only if that specific error is raised. # With a named error and messsage specified as a String, matches only if both match. # With a named error and messsage specified as a Regexp, matches only if both match. + # Pass an optional block to perform extra verifications on the exception matched # # == Examples # # lambda { do_something_risky }.should raise_error # lambda { do_something_risky }.should raise_error(PoorRiskDecisionError) + # lambda { do_something_risky }.should raise_error(PoorRiskDecisionError) { |error| error.data.should == 42 } # lambda { do_something_risky }.should raise_error(PoorRiskDecisionError, "that was too risky") # lambda { do_something_risky }.should raise_error(PoorRiskDecisionError, /oo ri/) # @@ -98,8 +125,8 @@ module Spec # lambda { do_something_risky }.should_not raise_error(PoorRiskDecisionError) # lambda { do_something_risky }.should_not raise_error(PoorRiskDecisionError, "that was too risky") # lambda { do_something_risky }.should_not raise_error(PoorRiskDecisionError, /oo ri/) - def raise_error(error=Exception, message=nil) - Matchers::RaiseError.new(error, message) + def raise_error(error=Exception, message=nil, &block) + Matchers::RaiseError.new(error, message, &block) end end end vendor/plugins/rspec/lib/spec/matchers/raise_error.rb @@ -1,6 +1,8 @@ module Spec module Matchers class SimpleMatcher + attr_reader :description + def initialize(description, &match_block) @description = description @match_block = match_block vendor/plugins/rspec/lib/spec/matchers/simple_matcher.rb @@ -4,6 +4,7 @@ module Spec class ThrowSymbol #:nodoc: def initialize(expected=nil) @expected = expected + @actual = nil end def matches?(proc) vendor/plugins/rspec/lib/spec/matchers/throw_symbol.rb @@ -1,7 +1,7 @@ module Spec module Mocks module ArgumentConstraintMatchers - + # Shortcut for creating an instance of Spec::Mocks::DuckTypeArgConstraint def duck_type(*args) DuckTypeArgConstraint.new(*args) @@ -19,6 +19,10 @@ module Spec BooleanArgConstraint.new(nil) end + def hash_including(expected={}) + HashIncludingConstraint.new(expected) + end + def no_args NoArgsConstraint.new end vendor/plugins/rspec/lib/spec/mocks/argument_constraint_matchers.rb @@ -108,6 +108,32 @@ module Spec "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 vendor/plugins/rspec/lib/spec/mocks/argument_expectation.rb @@ -10,7 +10,7 @@ module Spec @expected_from = expected_from @sym = sym @method_block = method_block - @return_block = lambda {} + @return_block = nil @actual_received_count = 0 @expected_received_count = expected_received_count @args_expectation = ArgumentExpectation.new([AnyArgsConstraint.new]) @@ -39,6 +39,8 @@ module Spec @expected_received_count < values.size end @return_block = block_given? ? return_block : lambda { value } + # Ruby 1.9 - see where this is used below + @ignore_args = !block_given? end # :call-seq: @@ -70,20 +72,32 @@ module Spec end def invoke(args, block) + if @expected_received_count == 0 + @actual_received_count += 1 + @error_generator.raise_expectation_error @sym, @expected_received_count, @actual_received_count, *args + end + @order_group.handle_order_constraint self begin Kernel::raise @exception_to_raise unless @exception_to_raise.nil? Kernel::throw @symbol_to_throw unless @symbol_to_throw.nil? - + + if !@method_block.nil? - return invoke_method_block(args) + default_return_val = invoke_method_block(args) elsif @args_to_yield.size > 0 - return invoke_with_yield(block) - elsif @consecutive - return invoke_consecutive_return_block(args, block) + default_return_val = invoke_with_yield(block) else + default_return_val = nil + end + + if @consecutive + return invoke_consecutive_return_block(args, block) + elsif @return_block return invoke_return_block(args, block) + else + return default_return_val end ensure @actual_received_count += 1 @@ -104,12 +118,14 @@ module Spec if block.nil? @error_generator.raise_missing_block_error @args_to_yield end + value = nil @args_to_yield.each do |args_to_yield_this_time| if block.arity > -1 && args_to_yield_this_time.length != block.arity @error_generator.raise_wrong_arity_error args_to_yield_this_time, block.arity end - block.call(*args_to_yield_this_time) + value = block.call(*args_to_yield_this_time) end + value end def invoke_consecutive_return_block(args, block) @@ -122,9 +138,14 @@ module Spec def invoke_return_block(args, block) args << block unless block.nil? - value = @return_block.call(*args) - - value + # Ruby 1.9 - when we set @return_block to return values + # regardless of arguments, any arguments will result in + # a "wrong number of arguments" error + if @ignore_args + @return_block.call() + else + @return_block.call(*args) + end end end @@ -134,9 +155,8 @@ module Spec @sym == sym and not @args_expectation.check_args(args) end - def verify_messages_received - return if ignoring_args? || matches_exact_count? || - matches_at_least_count? || matches_at_most_count? + def verify_messages_received + return if expected_messages_received? generate_error rescue Spec::Mocks::MockExpectationError => error @@ -144,6 +164,11 @@ module Spec Kernel::raise error end + def expected_messages_received? + ignoring_args? || matches_exact_count? || + matches_at_least_count? || matches_at_most_count? + end + def ignoring_args? @expected_received_count == :any end @@ -160,8 +185,20 @@ module Spec @expected_received_count == @actual_received_count end + def similar_messages + @similar_messages ||= [] + end + + def advise(args, block) + similar_messages << args + end + def generate_error - @error_generator.raise_expectation_error(@sym, @expected_received_count, @actual_received_count, *@args_expectation.args) + if similar_messages.empty? + @error_generator.raise_expectation_error(@sym, @expected_received_count, @actual_received_count, *@args_expectation.args) + else + @error_generator.raise_unexpected_message_args_error(self, *@similar_messages.first) + end end def with(*args, &block) vendor/plugins/rspec/lib/spec/mocks/message_expectation.rb @@ -3,18 +3,21 @@ module Spec class Mock include Methods - # Creates a new mock with a +name+ (that will be used in error messages only) - # == Options: - # * <tt>:null_object</tt> - if true, the mock object acts as a forgiving null object allowing any message to be sent to it. - def initialize(name, options={}) + # Creates a new mock with a +name+ (that will be used in error messages + # only) == Options: + # * <tt>:null_object</tt> - if true, the mock object acts as a forgiving + # null object allowing any message to be sent to it. + def initialize(name, stubs_and_options={}) @name = name - @options = options + @options = parse_options(stubs_and_options) + assign_stubs(stubs_and_options) end - # This allows for comparing the mock to other objects that proxy - # such as ActiveRecords belongs_to proxy objects - # By making the other object run the comparison, we're sure the call gets delegated to the proxy target - # This is an unfortunate side effect from ActiveRecord, but this should be safe unless the RHS redefines == in a nonsensical manner + # This allows for comparing the mock to other objects that proxy such as + # ActiveRecords belongs_to proxy objects By making the other object run + # the comparison, we're sure the call gets delegated to the proxy target + # This is an unfortunate side effect from ActiveRecord, but this should + # be safe unless the RHS redefines == in a nonsensical manner def ==(other) other == __mock_proxy end @@ -32,6 +35,18 @@ module Spec def inspect "#<#{self.class}:#{sprintf '0x%x', self.object_id} @name=#{@name.inspect}>" end + + private + + def parse_options(options) + options.has_key?(:null_object) ? {:null_object => options.delete(:null_object)} : {} + end + + def assign_stubs(stubs) + stubs.each_pair do |message, response| + stub!(message).and_return(response) + end + end end end end vendor/plugins/rspec/lib/spec/mocks/mock.rb @@ -63,10 +63,14 @@ module Spec 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) + elsif (stub = find_matching_method_stub(sym, *args)) + if expectation = find_almost_matching_expectation(sym, *args) + expectation.advise(args, block) unless expectation.expected_messages_received? + end stub.invoke([], block) elsif expectation = find_almost_matching_expectation(sym, *args) - raise_unexpected_message_args_error(expectation, *args) unless has_negative_expectation?(sym) unless null_object? + 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 end @@ -88,15 +92,15 @@ module Spec end def define_expected_method(sym) - if target_responds_to?(sym) && !@proxied_methods.include?(sym) + if target_responds_to?(sym) && !target_metaclass.method_defined?(munge(sym)) munged_sym = munge(sym) - metaclass.instance_eval do + target_metaclass.instance_eval do alias_method munged_sym, sym if method_defined?(sym.to_s) end @proxied_methods << sym end - metaclass_eval(<<-EOF, __FILE__, __LINE__) + target_metaclass.class_eval(<<-EOF, __FILE__, __LINE__) def #{sym}(*args, &block) __mock_proxy.message_received :#{sym}, *args, &block end @@ -125,12 +129,8 @@ module Spec @proxied_methods.clear end - def metaclass_eval(str, filename, lineno) - metaclass.class_eval(str, filename, lineno) - end - - def metaclass - (class << @target; self; end) + def target_metaclass + class << @target; self; end end def verify_expectations @@ -142,7 +142,7 @@ module Spec def reset_proxied_methods @proxied_methods.each do |sym| munged_sym = munge(sym) - metaclass.instance_eval do + target_metaclass.instance_eval do if method_defined?(munged_sym.to_s) alias_method sym, munged_sym undef_method munged_sym vendor/plugins/rspec/lib/spec/mocks/proxy.rb @@ -1,30 +1,31 @@ module Spec module Mocks - module SpecMethods + module ExampleMethods include Spec::Mocks::ArgumentConstraintMatchers # Shortcut for creating an instance of Spec::Mocks::Mock. - def mock(name, options={}) - Spec::Mocks::Mock.new(name, options) - end - - # Shortcut for creating an instance of Spec::Mocks::Mock with - # predefined method stubs. + # + # +name+ is used for failure reporting, so you should use the + # role that the mock is playing in the example. + # + # +stubs_and_options+ lets you assign options and stub values + # at the same time. The only option available is :null_object. + # Anything else is treated as a stub value. # # == Examples # - # stub_thing = stub("thing", :a => "A") + # stub_thing = mock("thing", :a => "A") # stub_thing.a == "A" => true # # stub_person = stub("thing", :name => "Joe", :email => "joe@domain.com") # stub_person.name => "Joe" # stub_person.email => "joe@domain.com" - def stub(name, stubs={}) - object_stub = mock(name) - stubs.each { |key, value| object_stub.stub!(key).and_return(value) } - object_stub + def mock(name, stubs_and_options={}) + Spec::Mocks::Mock.new(name, stubs_and_options) end + alias :stub :mock + # Shortcut for creating a mock object that will return itself in response # to any message it receives that it hasn't been explicitly instructed # to respond to. vendor/plugins/rspec/lib/spec/mocks/spec_methods.rb @@ -8,7 +8,7 @@ require 'rake/tasklib' module Spec module Rake - # A Rake task that runs a set of RSpec contexts. + # A Rake task that runs a set of specs. # # Example: # @@ -44,6 +44,17 @@ module Spec # Each attribute of this task may be a proc. This allows for lazy evaluation, # which is sometimes handy if you want to defer the evaluation of an attribute value # until the task is run (as opposed to when it is defined). + # + # This task can also be used to run existing Test::Unit tests and get RSpec + # output, for example like this: + # + # require 'rubygems' + # require 'spec/rake/spectask' + # Spec::Rake::SpecTask.new do |t| + # t.ruby_opts = ['-rtest/unit'] + # t.spec_files = FileList['test/**/*_test.rb'] + # end + # class SpecTask < ::Rake::TaskLib class << self def attr_accessor(*names) vendor/plugins/rspec/lib/spec/rake/spectask.rb @@ -38,7 +38,7 @@ module RCov total_coverage = nil File.open(index_html).each_line do |line| - if line =~ /<tt.*>(\d+\.\d+)%<\/tt>&nbsp;<\/td>/ + if line =~ /<tt class='coverage_total'>(\d+\.\d+)%<\/tt>/ total_coverage = eval($1) break end vendor/plugins/rspec/lib/spec/rake/verify_rcov.rb @@ -1,21 +1,20 @@ -require 'spec/runner/formatter' require 'spec/runner/options' require 'spec/runner/option_parser' -require 'spec/runner/behaviour_runner' +require 'spec/runner/example_group_runner' require 'spec/runner/command_line' require 'spec/runner/drb_command_line' require 'spec/runner/backtrace_tweaker' require 'spec/runner/reporter' -require 'spec/runner/extensions/object' require 'spec/runner/spec_parser' +require 'spec/runner/class_and_arguments_parser' module Spec - # == Behaviours and Examples + # == ExampleGroups and Examples # - # Rather than expressing examples in classes, RSpec uses a custom domain specific language to - # describe Behaviours and Examples of those behaviours. + # Rather than expressing examples in classes, RSpec uses a custom DSLL (DSL light) to + # describe groups of examples. # - # A Example is the equivalent of a fixture in xUnit-speak. It is a metaphor for the context + # 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 # @@ -124,11 +123,11 @@ module Spec # end # end # - # == Shared behaviour + # == Shared Example Groups # - # You can define a shared behaviour, that may be used on other behaviours + # You can define a shared Example Group, that may be used on other groups # - # describe "All Editions", :shared => true do + # share_examples_for "All Editions" do # it "all editions behaviour" ... # end # @@ -139,10 +138,35 @@ module Spec # ... # 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 << self def configuration # :nodoc: - @configuration ||= Spec::DSL::Configuration.new + @configuration ||= Spec::Example::Configuration.new end # Use this to configure various configurable aspects of @@ -153,12 +177,26 @@ module Spec # end # # The yielded <tt>configuration</tt> object is a - # Spec::DSL::Configuration instance. See its RDoc + # Spec::Example::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 + at_exit do + unless $! || Spec.run?; \ + success = Spec.run; \ + exit success if Spec.exit?; \ + end + end + $spec_runner_at_exit_hook_registered = true + end + end + end end end vendor/plugins/rspec/lib/spec/runner.rb @@ -7,7 +7,7 @@ module Spec end class NoisyBacktraceTweaker < BacktraceTweaker - def tweak_backtrace(error, spec_name) + def tweak_backtrace(error) return if error.backtrace.nil? error.backtrace.each do |line| clean_up_double_slashes(line) @@ -19,7 +19,7 @@ module Spec class QuietBacktraceTweaker < BacktraceTweaker unless defined?(IGNORE_PATTERNS) root_dir = File.expand_path(File.join(__FILE__, '..', '..', '..', '..')) - spec_files = Dir["#{root_dir}/lib/spec/*"].map do |path| + spec_files = Dir["#{root_dir}/lib/*"].map do |path| subpath = path[root_dir.length..-1] /#{subpath}/ end @@ -27,7 +27,7 @@ module Spec /\/lib\/ruby\//, /bin\/spec:/, /bin\/rcov:/, - /lib\/rspec_on_rails/, + /lib\/rspec-rails/, /vendor\/rails/, # TextMate's Ruby and RSpec plugins /Ruby\.tmbundle\/Support\/tmruby.rb:/, @@ -38,7 +38,7 @@ module Spec ] end - def tweak_backtrace(error, spec_name) + def tweak_backtrace(error) return if error.backtrace.nil? error.backtrace.collect! do |line| clean_up_double_slashes(line) vendor/plugins/rspec/lib/spec/runner/backtrace_tweaker.rb @@ -7,31 +7,21 @@ module Spec 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(argv, err, out) - old_rspec_options = defined?($rspec_options) ? $rspec_options : nil + 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 - parser = OptionParser.new(err, out) - parser.order!(argv) - options = parser.options - $rspec_options = options - return true if $rspec_options.generate - - options.load_paths - success = options.run_examples - heckle(options) if options.heckle_runner - - return success + $rspec_options = instance_rspec_options + return $rspec_options.run_examples ensure - $rspec_options = old_rspec_options + ::Spec.run = true + $rspec_options = orig_rspec_options end end - - protected - def heckle(options) - heckle_runner = options.heckle_runner - options.heckle_runner = nil - heckle_runner.heckle_with - end end end end vendor/plugins/rspec/lib/spec/runner/command_line.rb @@ -6,13 +6,13 @@ module Spec class DrbCommandLine # Runs specs on a DRB server. Note that this API is similar to that of # CommandLine - making it possible for clients to use both interchangeably. - def self.run(argv, stderr, stdout) + def self.run(options) begin DRb.start_service spec_server = DRbObject.new_with_uri("druby://localhost:8989") - spec_server.run(argv, stderr, stdout) + spec_server.run(options.argv, options.error_stream, options.output_stream) rescue DRb::DRbConnError => e - stderr.puts "No server is running" + options.error_stream.puts "No server is running" end end end vendor/plugins/rspec/lib/spec/runner/drb_command_line.rb @@ -3,6 +3,7 @@ module Spec module Formatter # Baseclass for formatters that implements all required methods as no-ops. class BaseFormatter + attr_accessor :example_group, :options, :where def initialize(options, where) @options = options @where = where @@ -13,16 +14,16 @@ module Spec # formatters that need to provide progress on feedback (graphical ones) # # This method will only be invoked once, and the next one to be invoked - # is #add_behaviour + # is #add_example_group def start(example_count) end - # This method is invoked at the beginning of the execution of each behaviour. - # +name+ is the name of the behaviour and +first+ is true if it is the - # first behaviour - otherwise it's false. + # This method is invoked at the beginning of the execution of each example_group. + # +example_group+ is the example_group. # # The next method to be invoked after this is #example_failed or #example_finished - def add_behaviour(name) + def add_example_group(example_group) + @example_group = example_group end # This method is invoked when an +example+ starts. @@ -42,10 +43,9 @@ module Spec # This method is invoked when an example is not yet implemented (i.e. has not # been provided a block), or when an ExamplePendingError is raised. - # +name+ is the name of the example. # +message+ is the message from the ExamplePendingError, if it exists, or the # default value of "Not Yet Implemented" - def example_pending(behaviour_name, example_name, message) + def example_pending(example, message) 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 @@ -1,3 +1,5 @@ +require 'spec/runner/formatter/base_formatter' + module Spec module Runner module Formatter @@ -5,6 +7,7 @@ module Spec # non-text based ones too - just ignore the +output+ constructor # argument. class BaseTextFormatter < BaseFormatter + attr_reader :output, :pending_examples # Creates a new instance that will write to +where+. If +where+ is a # String, output will be written to the File with that name, otherwise # +where+ is exected to be an IO (or an object that responds to #puts and #write). @@ -20,12 +23,11 @@ module Spec else @output = where end - @snippet_extractor = SnippetExtractor.new @pending_examples = [] end - def example_pending(behaviour_name, example_name, message) - @pending_examples << ["#{behaviour_name} #{example_name}", message] + def example_pending(example, message) + @pending_examples << [example.__full_description, message] end def dump_failure(counter, failure) @@ -98,7 +100,7 @@ module Spec def dry_run? @options.dry_run ? true : false end - + def backtrace_line(line) line.sub(/\A([^:]+:\d+)$/, '\\1:') end vendor/plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb @@ -1,13 +1,11 @@ +require 'spec/runner/formatter/base_text_formatter' + module Spec module Runner module Formatter class FailingExamplesFormatter < BaseTextFormatter - def add_behaviour(behaviour_name) - @behaviour_name = behaviour_name - end - def example_failed(example, counter, failure) - @output.puts "#{@behaviour_name} #{example.description}" + @output.puts "#{example_group.description} #{example.description}" @output.flush end vendor/plugins/rspec/lib/spec/runner/formatter/failing_examples_formatter.rb @@ -1,4 +1,5 @@ require 'erb' +require 'spec/runner/formatter/base_text_formatter' module Spec module Runner @@ -8,13 +9,17 @@ module Spec def initialize(options, output) super - @current_behaviour_number = 0 + @current_example_group_number = 0 @current_example_number = 0 end + + def method_missing(sym, *args) + # no-op + end - # The number of the currently running behaviour - def current_behaviour_number - @current_behaviour_number + # The number of the currently running example_group + def current_example_group_number + @current_example_group_number end # The number of the currently running example (a global counter) @@ -30,17 +35,18 @@ module Spec @output.flush end - def add_behaviour(name) - @behaviour_red = false - @behaviour_red = false - @current_behaviour_number += 1 - unless current_behaviour_number == 1 + def add_example_group(example_group) + super + @example_group_red = false + @example_group_red = false + @current_example_group_number += 1 + unless current_example_group_number == 1 @output.puts " </dl>" @output.puts "</div>" end - @output.puts "<div class=\"behaviour\">" + @output.puts "<div class=\"example_group\">" @output.puts " <dl>" - @output.puts " <dt id=\"behaviour_#{current_behaviour_number}\">#{h(name)}</dt>" + @output.puts " <dt id=\"example_group_#{current_example_group_number}\">#{h(example_group.description)}</dt>" @output.flush end @@ -51,7 +57,7 @@ module Spec end def example_started(example) - @current_example_number = example.number + @current_example_number += 1 end def example_passed(example) @@ -65,8 +71,8 @@ module Spec failure_style = failure.pending_fixed? ? 'pending_fixed' : 'failed' @output.puts " <script type=\"text/javascript\">makeRed('rspec-header');</script>" unless @header_red @header_red = true - @output.puts " <script type=\"text/javascript\">makeRed('behaviour_#{current_behaviour_number}');</script>" unless @behaviour_red - @behaviour_red = true + @output.puts " <script type=\"text/javascript\">makeRed('example_group_#{current_example_group_number}');</script>" unless @example_group_red + @example_group_red = true move_progress @output.puts " <dd class=\"spec #{failure_style}\">" @output.puts " <span class=\"failed_spec_name\">#{h(example.description)}</span>" @@ -79,11 +85,11 @@ module Spec @output.flush end - def example_pending(behaviour_name, example_name, message) + def example_pending(example, message) @output.puts " <script type=\"text/javascript\">makeYellow('rspec-header');</script>" unless @header_red - @output.puts " <script type=\"text/javascript\">makeYellow('behaviour_#{current_behaviour_number}');</script>" unless @behaviour_red + @output.puts " <script type=\"text/javascript\">makeYellow('example_group_#{current_example_group_number}');</script>" unless @example_group_red move_progress - @output.puts " <dd class=\"spec not_implemented\"><span class=\"not_implemented_spec_name\">#{h(example_name)}</span></dd>" + @output.puts " <dd class=\"spec not_implemented\"><span class=\"not_implemented_spec_name\">#{h(example.description)} (PENDING: #{h(message)})</span></dd>" @output.flush end @@ -91,15 +97,24 @@ module Spec # could output links to images or other files produced during the specs. # def extra_failure_content(failure) + require 'spec/runner/formatter/snippet_extractor' + @snippet_extractor ||= SnippetExtractor.new " <pre class=\"ruby\"><code>#{@snippet_extractor.snippet(failure.exception)}</code></pre>" end def move_progress - percent_done = @example_count == 0 ? 100.0 : ((current_example_number + 1).to_f / @example_count.to_f * 1000).to_i / 10.0 @output.puts " <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>" @output.flush end + def percent_done + result = 100.0 + if @example_count != 0 + result = ((current_example_number).to_f / @example_count.to_f * 1000).to_i / 10.0 + end + result + end + def dump_failure(counter, failure) end @@ -224,7 +239,7 @@ EOF font-size: 1.2em; } -.behaviour { +.example_group { margin: 0 10px 5px; background: #fff; } vendor/plugins/rspec/lib/spec/runner/formatter/html_formatter.rb @@ -1,10 +1,9 @@ +require 'spec/runner/formatter/base_text_formatter' + module Spec module Runner module Formatter class ProgressBarFormatter < BaseTextFormatter - def add_behaviour(name) - end - def example_failed(example, counter, failure) @output.print colourise('F', failure) @output.flush @@ -15,7 +14,7 @@ module Spec @output.flush end - def example_pending(behaviour_name, example_name, message) + def example_pending(example, message) super @output.print yellow('P') @output.flush @@ -25,6 +24,10 @@ module Spec @output.puts @output.flush end + + def method_missing(sym, *args) + # ignore + end end end end vendor/plugins/rspec/lib/spec/runner/formatter/progress_bar_formatter.rb @@ -1,27 +1,37 @@ +require 'spec/runner/formatter/base_text_formatter' + module Spec module Runner module Formatter - class SpecdocFormatter < BaseTextFormatter - def add_behaviour(name) - @output.puts - @output.puts name - @output.flush + class SpecdocFormatter < BaseTextFormatter + def add_example_group(example_group) + super + output.puts + output.puts example_group.description + output.flush end def example_failed(example, counter, failure) - @output.puts failure.expectation_not_met? ? red("- #{example.description} (FAILED - #{counter})") : magenta("- #{example.description} (ERROR - #{counter})") - @output.flush + message = if failure.expectation_not_met? + "- #{example.description} (FAILED - #{counter})" + else + "- #{example.description} (ERROR - #{counter})" + end + + output.puts(failure.expectation_not_met? ? red(message) : magenta(message)) + output.flush end - + def example_passed(example) - @output.puts green("- #{example.description}") - @output.flush + message = "- #{example.description}" + output.puts green(message) + output.flush end - def example_pending(behaviour_name, example_name, message) + def example_pending(example, message) super - @output.puts yellow("- #{example_name} (PENDING: #{message})") - @output.flush + output.puts yellow("- #{example.description} (PENDING: #{message})") + output.flush end end end vendor/plugins/rspec/lib/spec/runner/formatter/specdoc_formatter.rb @@ -13,7 +13,7 @@ module Spec @heckle_class = heckle_class end - # Runs all the behaviours held by +rspec_options+ once for each of the + # Runs all the example groups held by +rspec_options+ once for each of the # methods in the matched classes. def heckle_with if @filter =~ /(.*)[#\.](.*)/ @@ -60,13 +60,13 @@ module Spec def initialize(klass_name, method_name, rspec_options) super(klass_name, method_name) @rspec_options = rspec_options - @rspec_options.load_paths end def tests_pass? - failure_count = @rspec_options.run_examples - failure_count == 0 + success = @rspec_options.run_examples + success end + end end end vendor/plugins/rspec/lib/spec/runner/heckle_runner.rb @@ -14,23 +14,12 @@ module Spec attr_reader :options - BUILT_IN_FORMATTERS = { - 'specdoc' => Formatter::SpecdocFormatter, - 's' => Formatter::SpecdocFormatter, - 'html' => Formatter::HtmlFormatter, - 'h' => Formatter::HtmlFormatter, - 'rdoc' => Formatter::RdocFormatter, - 'r' => Formatter::RdocFormatter, - 'progress' => Formatter::ProgressBarFormatter, - 'p' => Formatter::ProgressBarFormatter, - 'failing_examples' => Formatter::FailingExamplesFormatter, - 'e' => Formatter::FailingExamplesFormatter, - 'failing_behaviours' => Formatter::FailingBehavioursFormatter, - 'b' => Formatter::FailingBehavioursFormatter - } - OPTIONS = { - :diff => ["-D", "--diff [FORMAT]", "Show diff of objects that are expected to be equal when they are not", + :pattern => ["-p", "--pattern [PATTERN]","Limit files loaded to those matching this pattern. Defaults to '**/*_spec.rb'", + "Separate multiple patterns with commas.", + "Applies only to directories named on the command line (files", + "named explicitly on the command line will be loaded regardless)."], + :diff => ["-D", "--diff [FORMAT]","Show diff of objects that are expected to be equal when they are not", "Builtin formats: unified|u|context|c", "You can also specify a custom differ class", "(in which case you should also specify --require)"], @@ -47,30 +36,34 @@ module Spec :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)"], - :format => ["-f", "--format FORMAT[:WHERE]", "Specifies what format to use for output. Specify WHERE to tell", + :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", "not specified. The --format option may be specified several times", "if you want several outputs", " ", - "Builtin formats: ", - "progress|p : Text progress", - "specdoc|s : Example doc as text", - "rdoc|r : Example doc as RDoc", + "Builtin formats for examples: ", + "progress|p : Text progress", + "profile|o : Text progress with profiling of 10 slowest examples", + "specdoc|s : Example doc as text", + "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", - "failing_examples|e : Write all failing examples - input for --example", - "failing_behaviours|b : Write all failing behaviours - input for --example", " ", "FORMAT can also be the name of a custom formatter class", "(in which case you should also specify --require to load it)"], :require => ["-r", "--require FILE", "Require FILE before running specs", - "Useful for loading custom formatters or other extensions.", - "If this option is used it must come before the others"], + "Useful for loading custom formatters or other extensions.", + "If this option is used it must come before the others"], :backtrace => ["-b", "--backtrace", "Output full backtrace"], :loadby => ["-L", "--loadby STRATEGY", "Specify the strategy by which spec files should be loaded.", - "STRATEGY can currently only be 'mtime' (File modification time)", - "By default, spec files are loaded in alphabetical order if --loadby", - "is not specified."], + "STRATEGY can currently only be 'mtime' (File modification time)", + "By default, spec files are loaded in alphabetical order if --loadby", + "is not specified."], :reverse => ["-R", "--reverse", "Run examples in reverse order"], :timeout => ["-t", "--timeout FLOAT", "Interrupt and fail each example that doesn't complete in the", "specified time"], @@ -83,7 +76,7 @@ module Spec :dry_run => ["-d", "--dry-run", "Invokes formatters without executing the examples."], :options_file => ["-O", "--options PATH", "Read options from a file"], :generate_options => ["-G", "--generate-options PATH", "Generate an options file for --options"], - :runner => ["-U", "--runner RUNNER", "Use a custom BehaviourRunner."], + :runner => ["-U", "--runner RUNNER", "Use a custom Runner."], :drb => ["-X", "--drb", "Run examples via DRb. (For example against script/spec_server)"], :version => ["-v", "--version", "Show version"], :help => ["-h", "--help", "You're looking at it"] @@ -95,37 +88,35 @@ module Spec @out_stream = out @options = Options.new(@error_stream, @out_stream) - @spec_parser = SpecParser.new @file_factory = File 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]) {|req| @options.parse_require(req)} + 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.parse_heckle(heckle)} + 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]) do |options_file| - end - on(*OPTIONS[:runner]) do |runner| - @options.runner_arg = runner - end + on(*OPTIONS[:generate_options]) {|options_file|} + on(*OPTIONS[:runner]) {|runner| @options.user_input_for_runner = runner} on(*OPTIONS[:drb]) {} on(*OPTIONS[:version]) {parse_version} - self.on_tail(*OPTIONS[:help]) {parse_help} + on_tail(*OPTIONS[:help]) {parse_help} end - def order!(argv=default_argv, &blk) + def order!(argv, &blk) @argv = argv + @options.argv = @argv.dup return if parse_generate_options return if parse_drb @@ -134,21 +125,23 @@ module Spec blk.call(file) if blk end - if @options.line_number - set_spec_from_line_number - end - - if @options.formatters.empty? - @options.create_formatter(Formatter::ProgressBarFormatter) - end - @options end protected + def invoke_requires(requires) + requires.split(",").each do |file| + require file + end + end + def parse_options_file(options_file) option_file_args = IO.readlines(options_file).map {|l| l.chomp.split " "}.flatten @argv.push(*option_file_args) + # TODO - this is a brute force solution to http://rspec.lighthouseapp.com/projects/5645/tickets/293. + # Let's look for a cleaner way. Might not be one. But let's look. If not, perhaps + # this can be moved to a different method to indicate the special handling for drb? + parse_drb(@argv) end def parse_generate_options @@ -175,14 +168,20 @@ module Spec end @out_stream.puts "\nOptions written to #{options_file}. You can now use these options with:" @out_stream.puts "spec --options #{options_file}" - @options.generate = true + @options.examples_should_not_be_run end - def parse_drb + def parse_drb(argv = nil) + argv ||= @options.argv # TODO - see note about about http://rspec.lighthouseapp.com/projects/5645/tickets/293 is_drb = false - is_drb ||= @argv.delete(OPTIONS[:drb][0]) - is_drb ||= @argv.delete(OPTIONS[:drb][1]) - return is_drb ? DrbCommandLine.run(@argv, @error_stream, @out_stream) : nil + is_drb ||= argv.delete(OPTIONS[:drb][0]) + is_drb ||= argv.delete(OPTIONS[:drb][1]) + return false unless is_drb + @options.examples_should_not_be_run + DrbCommandLine.run( + self.class.parse(argv, @error_stream, @out_stream) + ) + true end def parse_version @@ -195,37 +194,9 @@ module Spec exit if stdout? end - def set_spec_from_line_number - if @options.examples.empty? - if @options.files.length == 1 - if @file_factory.file?(@options.files[0]) - source = @file_factory.open(@options.files[0]) - example = @spec_parser.spec_name_for(source, @options.line_number) - @options.parse_example(example) - elsif @file_factory.directory?(@options.files[0]) - @error_stream.puts "You must specify one file, not a directory when using the --line option" - exit(1) if stderr? - else - @error_stream.puts "#{@options.files[0]} does not exist" - exit(2) if stderr? - end - else - @error_stream.puts "Only one file can be specified when using the --line option: #{@options.files.inspect}" - exit(3) if stderr? - end - else - @error_stream.puts "You cannot use both --line and --example" - exit(4) if stderr? - end - end - def stdout? @out_stream == $stdout end - - def stderr? - @error_stream == $stderr - end end end end vendor/plugins/rspec/lib/spec/runner/option_parser.rb @@ -4,31 +4,38 @@ module Spec FILE_SORTERS = { 'mtime' => lambda {|file_a, file_b| File.mtime(file_b) <=> File.mtime(file_a)} } - - BUILT_IN_FORMATTERS = { - 'specdoc' => Formatter::SpecdocFormatter, - 's' => Formatter::SpecdocFormatter, - 'html' => Formatter::HtmlFormatter, - 'h' => Formatter::HtmlFormatter, - 'rdoc' => Formatter::RdocFormatter, - 'r' => Formatter::RdocFormatter, - 'progress' => Formatter::ProgressBarFormatter, - 'p' => Formatter::ProgressBarFormatter, - 'failing_examples' => Formatter::FailingExamplesFormatter, - 'e' => Formatter::FailingExamplesFormatter, - 'failing_behaviours' => Formatter::FailingBehavioursFormatter, - 'b' => Formatter::FailingBehavioursFormatter + + EXAMPLE_FORMATTERS = { # Load these lazily for better speed + 'specdoc' => ['spec/runner/formatter/specdoc_formatter', 'Formatter::SpecdocFormatter'], + 's' => ['spec/runner/formatter/specdoc_formatter', 'Formatter::SpecdocFormatter'], + 'html' => ['spec/runner/formatter/html_formatter', 'Formatter::HtmlFormatter'], + 'h' => ['spec/runner/formatter/html_formatter', 'Formatter::HtmlFormatter'], + 'progress' => ['spec/runner/formatter/progress_bar_formatter', 'Formatter::ProgressBarFormatter'], + 'p' => ['spec/runner/formatter/progress_bar_formatter', 'Formatter::ProgressBarFormatter'], + 'failing_examples' => ['spec/runner/formatter/failing_examples_formatter', 'Formatter::FailingExamplesFormatter'], + 'e' => ['spec/runner/formatter/failing_examples_formatter', 'Formatter::FailingExamplesFormatter'], +'failing_example_groups' => ['spec/runner/formatter/failing_example_groups_formatter', 'Formatter::FailingExampleGroupsFormatter'], + 'g' => ['spec/runner/formatter/failing_example_groups_formatter', 'Formatter::FailingExampleGroupsFormatter'], + 'profile' => ['spec/runner/formatter/profile_formatter', 'Formatter::ProfileFormatter'], + 'o' => ['spec/runner/formatter/profile_formatter', 'Formatter::ProfileFormatter'], + 'textmate' => ['spec/runner/formatter/text_mate_formatter', 'Formatter::TextMateFormatter'] } - + + 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'] + } + attr_accessor( + :filename_pattern, :backtrace_tweaker, :context_lines, :diff_format, :dry_run, + :profile, :examples, - :failure_file, - :formatters, - :generate, :heckle_runner, :line_number, :loadby, @@ -36,58 +43,80 @@ module Spec :reverse, :timeout, :verbose, - :runner_arg + :user_input_for_runner, + :error_stream, + :output_stream, + # TODO: BT - Figure out a better name + :argv ) - attr_reader :colour, :differ_class, :files, :behaviours + attr_reader :colour, :differ_class, :files, :example_groups def initialize(error_stream, output_stream) @error_stream = error_stream @output_stream = output_stream + @filename_pattern = "**/*_spec.rb" @backtrace_tweaker = QuietBacktraceTweaker.new @examples = [] - @formatters = [] @colour = false + @profile = false @dry_run = false @reporter = Reporter.new(self) @context_lines = 3 @diff_format = :unified @files = [] - @behaviours = [] + @example_groups = [] + @examples_run = false + @examples_should_be_run = nil + @user_input_for_runner = nil end - def add_behaviour(behaviour) - @behaviours << behaviour + def add_example_group(example_group) + @example_groups << example_group end - def run_examples - runner = custom_runner || BehaviourRunner.new(self) - runner.run + def remove_example_group(example_group) + @example_groups.delete(example_group) end - def colour=(colour) - @colour = colour - begin; \ - require 'Win32/Console/ANSI' if @colour && PLATFORM =~ /win32/; \ - rescue LoadError ; \ - raise "You must gem install win32console to use colour on Windows" ; \ + def run_examples + return true unless examples_should_be_run? + runner = custom_runner || ExampleGroupRunner.new(self) + + unless @files_loaded + runner.load_files(files_to_load) + @files_loaded = true end - end - def custom_runner? - return @runner_arg ? true : false + if example_groups.empty? + true + else + set_spec_from_line_number if line_number + success = runner.run + @examples_run = true + heckle if heckle_runner + success + end end - def custom_runner - return nil unless custom_runner? - klass_name, arg = split_at_colon(@runner_arg) - runner_type = load_class(klass_name, 'behaviour runner', '--runner') - return runner_type.new(self, arg) + def examples_run? + @examples_run end - def differ_class=(klass) - return unless klass - @differ_class = klass - Spec::Expectations.differ = self.differ_class.new(self) + def examples_should_not_be_run + @examples_should_be_run = false + end + + def colour=(colour) + @colour = colour + if @colour && RUBY_PLATFORM =~ /win32/ ;\ + begin ;\ + require 'rubygems' ;\ + require 'Win32/Console/ANSI' ;\ + rescue LoadError ;\ + warn "You must 'gem install win32console' to use colour on Windows" ;\ + @colour = false ;\ + end + end end def parse_diff(format) @@ -113,43 +142,80 @@ module Spec end def parse_format(format_arg) - format, where = split_at_colon(format_arg) - # This funky regexp checks whether we have a FILE_NAME or not + format, where = ClassAndArgumentsParser.parse(format_arg) unless where raise "When using several --format options only one of them can be without a file" if @out_used where = @output_stream @out_used = true end - - formatter_type = BUILT_IN_FORMATTERS[format] || load_class(format, 'formatter', '--format') - create_formatter(formatter_type, where) + @format_options ||= [] + @format_options << [format, where] end - - def create_formatter(formatter_type, where=@output_stream) - formatter = formatter_type.new(self, where) - @formatters << formatter - formatter + + def formatters + @format_options ||= [['progress', @output_stream]] + @formatters ||= load_formatters(@format_options, EXAMPLE_FORMATTERS) end - def parse_require(req) - req.split(",").each{|file| require file} + def story_formatters + @format_options ||= [['plain', @output_stream]] + @formatters ||= load_formatters(@format_options, STORY_FORMATTERS) + end + + def load_formatters(format_options, formatters) + format_options.map do |format, where| + formatter_type = if formatters[format] + require formatters[format][0] + eval(formatters[format][1], binding, __FILE__, __LINE__) + else + load_class(format, 'formatter', '--format') + end + formatter_type.new(self, where) + end end - def parse_heckle(heckle) - heckle_require = [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM} ? 'spec/runner/heckle_runner_unsupported' : 'spec/runner/heckle_runner' - require heckle_require + def load_heckle_runner(heckle) + suffix = [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM} ? '_unsupported' : '' + require "spec/runner/heckle_runner#{suffix}" @heckle_runner = HeckleRunner.new(heckle) end - def split_at_colon(s) - if s =~ /([a-zA-Z_]+(?:::[a-zA-Z_]+)*):?(.*)/ - arg = $2 == "" ? nil : $2 - [$1, arg] - else - raise "Couldn't parse #{s.inspect}" + def number_of_examples + total = 0 + @example_groups.each do |example_group| + total += example_group.number_of_examples + end + total + end + + def files_to_load + result = [] + sorted_files.each do |file| + if File.directory?(file) + filename_pattern.split(",").each do |pattern| + result += Dir[File.expand_path("#{file}/#{pattern.strip}")] + end + elsif File.file?(file) + result << file + else + raise "File or directory not found: #{file}" + end end + result + end + + protected + def examples_should_be_run? + return @examples_should_be_run unless @examples_should_be_run.nil? + @examples_should_be_run = true end + def differ_class=(klass) + return unless klass + @differ_class = klass + Spec::Expectations.differ = self.differ_class.new(self) + end + def load_class(name, kind, option) if name =~ /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ arg = $2 == "" ? nil : $2 @@ -167,44 +233,60 @@ module Spec if $_spec_spec ; raise e ; else exit(1) ; end end end - - def load_paths - paths.each do |path| - load path - end + + def custom_runner + return nil unless custom_runner? + klass_name, arg = ClassAndArgumentsParser.parse(user_input_for_runner) + runner_type = load_class(klass_name, 'behaviour runner', '--runner') + return runner_type.new(self, arg) end - def paths - result = [] - sorted_files.each do |file| - if test ?d, file - result += Dir[File.expand_path("#{file}/**/*.rb")] - elsif test ?f, file - result << file - else - raise "File or directory not found: #{file}" - end - end - result + def custom_runner? + return user_input_for_runner ? true : false end - - def number_of_examples - @behaviours.inject(0) {|sum, behaviour| sum + behaviour.number_of_examples} + + def heckle + heckle_runner = self.heckle_runner + self.heckle_runner = nil + heckle_runner.heckle_with end - protected def sorted_files return sorter ? files.sort(&sorter) : files end - + def sorter FILE_SORTERS[loadby] end - + def default_differ require 'spec/expectations/differs/default' self.differ_class = Spec::Expectations::Differs::Default - end + end + + def set_spec_from_line_number + if examples.empty? + if files.length == 1 + if File.directory?(files[0]) + 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) + @examples = [example] + end + else + error_stream.puts "Only one file can be specified when using the --line option: #{files.inspect}" + exit(3) if stderr? + end + else + error_stream.puts "You cannot use both --line and --example" + exit(4) if stderr? + end + end + + def stderr? + @error_stream == $stderr + end end end end vendor/plugins/rspec/lib/spec/runner/options.rb @@ -1,35 +1,46 @@ module Spec module Runner class Reporter - attr_reader :options + attr_reader :options, :example_groups def initialize(options) @options = options + @options.reporter = self clear end - def add_behaviour(name) - formatters.each{|f| f.add_behaviour(name)} - @behaviour_names << name + def add_example_group(example_group) + formatters.each do |f| + f.add_example_group(example_group) + end + example_groups << example_group end - def example_started(example_definition) - formatters.each{|f| f.example_started(example_definition)} + def example_started(example) + formatters.each{|f| f.example_started(example)} end - def example_finished(example_definition, error=nil, failure_location=nil, not_implemented = false) - @example_names << example_definition + def example_finished(example, error=nil) + @examples << example - if not_implemented - example_pending(@behaviour_names.last, example_definition) - elsif error.nil? - example_passed(example_definition) - elsif Spec::DSL::ExamplePendingError === error - example_pending(@behaviour_names.last, example_definition, error.message) + if error.nil? + example_passed(example) + elsif Spec::Example::ExamplePendingError === error + example_pending(example, error.message) else - example_failed(example_definition, error, failure_location) + example_failed(example, error) + end + end + + def failure(example, error) + backtrace_tweaker.tweak_backtrace(error) + failure = Failure.new(example, error) + @failures << failure + formatters.each do |f| + f.example_failed(example, @failures.length, failure) end end + alias_method :example_failed, :failure def start(number_of_examples) clear @@ -47,7 +58,7 @@ module Spec dump_pending dump_failures formatters.each do |f| - f.dump_summary(duration, @example_names.length, @failures.length, @pending_count) + f.dump_summary(duration, @examples.length, @failures.length, @pending_count) f.close end @failures.length @@ -64,10 +75,10 @@ module Spec end def clear - @behaviour_names = [] + @example_groups = [] @failures = [] @pending_count = 0 - @example_names = [] + @examples = [] @start_time = nil @end_time = nil end @@ -79,6 +90,7 @@ module Spec index + 1 end end + def dump_pending formatters.each{|f| f.dump_pending} end @@ -88,49 +100,47 @@ module Spec return "0.0" end - def example_passed(name) - formatters.each{|f| f.example_passed(name)} - end - - def example_failed(name, error, failure_location) - backtrace_tweaker.tweak_backtrace(error, failure_location) - example_name = "#{@behaviour_names.last} #{name}" - failure = Failure.new(example_name, error) - @failures << failure - formatters.each{|f| f.example_failed(name, @failures.length, failure)} + def example_passed(example) + formatters.each{|f| f.example_passed(example)} end - def example_pending(behaviour_name, example_name, message="Not Yet Implemented") + def example_pending(example, message="Not Yet Implemented") @pending_count += 1 - formatters.each{|f| f.example_pending(behaviour_name, example_name, message)} + formatters.each do |f| + f.example_pending(example, message) + end end class Failure - attr_reader :exception + attr_reader :example, :exception - def initialize(example_name, exception) - @example_name = example_name + def initialize(example, exception) + @example = example @exception = exception end def header if expectation_not_met? - "'#{@example_name}' FAILED" + "'#{example_name}' FAILED" elsif pending_fixed? - "'#{@example_name}' FIXED" + "'#{example_name}' FIXED" else - "#{@exception.class.name} in '#{@example_name}'" + "#{@exception.class.name} in '#{example_name}'" end end def pending_fixed? - @exception.is_a?(Spec::DSL::PendingFixedError) + @exception.is_a?(Spec::Example::PendingExampleFixedError) end def expectation_not_met? @exception.is_a?(Spec::Expectations::ExpectationNotMetError) end + protected + def example_name + @example.__full_description + end end end end vendor/plugins/rspec/lib/spec/runner/reporter.rb @@ -2,14 +2,28 @@ module Spec module Runner # Parses a spec file and finds the nearest example for a given line number. class SpecParser - def spec_name_for(io, line_number) - source = io.read - behaviour, behaviour_line = behaviour_at_line(source, line_number) - example, example_line = example_at_line(source, line_number) - if behaviour && example && (behaviour_line < example_line) - "#{behaviour} #{example}" - elsif behaviour - behaviour + attr_reader :best_match + + def initialize + @best_match = {} + 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 + + example_group.examples.each do |example| + consider_example_for_best_match example, example_group, file, line_number + end + end + if best_match[:example_group] + if best_match[:example] + "#{best_match[:example_group].description} #{best_match[:example].description}" + else + best_match[:example_group].description + end else nil end @@ -17,36 +31,40 @@ module Spec protected - def behaviour_at_line(source, line_number) - find_above(source, line_number, /^\s*(context|describe)\s+(.*)\s+do/) - end - - def example_at_line(source, line_number) - find_above(source, line_number, /^\s*(specify|it)\s+(.*)\s+do/) + def consider_example_groups_for_best_match(example_group, file, line_number) + parsed_backtrace = parse_backtrace(example_group.registration_backtrace) + parsed_backtrace.each do |example_file, example_line| + if is_best_match?(file, line_number, example_file, example_line) + best_match.clear + best_match[:example_group] = example_group + best_match[:line] = example_line + end + end end - # Returns the context/describe or specify/it name and the line number - def find_above(source, line_number, pattern) - lines_above_reversed(source, line_number).each_with_index do |line, n| - return [parse_description($2), line_number-n] if line =~ pattern + def consider_example_for_best_match(example, example_group, file, line_number) + parsed_backtrace = parse_backtrace(example.implementation_backtrace) + parsed_backtrace.each do |example_file, example_line| + if is_best_match?(file, line_number, example_file, example_line) + best_match.clear + best_match[:example_group] = example_group + best_match[:example] = example + best_match[:line] = example_line + end end - nil end - def lines_above_reversed(source, line_number) - lines = source.split("\n") - lines[0...line_number].reverse + def is_best_match?(file, line_number, example_file, example_line) + file == File.expand_path(example_file) && + example_line <= line_number && + example_line > best_match[:line].to_i end - - def parse_description(str) - return str[1..-2] if str =~ /^['"].*['"]$/ - if matches = /^['"](.*)['"](,.*)?$/.match(str) - return ::Spec::DSL::BehaviourDescription.generate_description(matches[1]) - end - if matches = /^(.*)\s*,\s*['"](.*)['"](,.*)?$/.match(str) - return ::Spec::DSL::BehaviourDescription.generate_description(matches[1], matches[2]) + + def parse_backtrace(backtrace) + backtrace.collect do |trace_line| + split_line = trace_line.split(':') + [split_line[0], Integer(split_line[1])] end - return str end end end vendor/plugins/rspec/lib/spec/runner/spec_parser.rb @@ -1,10 +1,10 @@ -require 'spec/story/documenter' +require 'spec' require 'spec/story/extensions' require 'spec/story/given_scenario' -require 'spec/story/reporter' require 'spec/story/runner' require 'spec/story/scenario' -require 'spec/story/simple_step' +require 'spec/story/step' +require 'spec/story/step_group' require 'spec/story/step_mother' require 'spec/story/story' require 'spec/story/world' vendor/plugins/rspec/lib/spec/story.rb @@ -1 +1,3 @@ require 'spec/story/extensions/main' +require 'spec/story/extensions/string' +require 'spec/story/extensions/regexp' vendor/plugins/rspec/lib/spec/story/extensions.rb @@ -5,6 +5,79 @@ module Spec def Story(title, narrative, params = {}, &body) ::Spec::Story::Runner.story_runner.Story(title, narrative, params, &body) end + + # Calling this deprecated is silly, since it hasn't been released yet. But, for + # those who are reading this - this will be deleted before the 1.1 release. + def run_story(*args, &block) + runner = Spec::Story::Runner::PlainTextStoryRunner.new(*args) + runner.instance_eval(&block) if block + runner.run + end + + # Creates (or appends to an existing) a namespaced group of steps for use in Stories + # + # == Examples + # + # # Creating a new group + # steps_for :forms do + # When("user enters $value in the $field field") do ... end + # When("user submits the $form form") do ... end + # end + def steps_for(tag, &block) + steps = rspec_story_steps[tag] + steps.instance_eval(&block) if block + steps + end + + # Creates a context for running a Plain Text Story with specific groups of Steps. + # Also supports adding arbitrary steps that will only be accessible to + # the Story being run. + # + # == Examples + # + # # Run a Story with one group of steps + # with_steps_for :checking_accounts do + # run File.dirname(__FILE__) + "/withdraw_cash" + # end + # + # # Run a Story, adding steps that are only available for this Story + # with_steps_for :accounts do + # Given "user is logged in as account administrator" + # run File.dirname(__FILE__) + "/reconcile_accounts" + # end + # + # # Run a Story with steps from two groups + # with_steps_for :checking_accounts, :savings_accounts do + # run File.dirname(__FILE__) + "/transfer_money" + # end + # + # # Run a Story with a specific Story extension + # with_steps_for :login, :navigation do + # run File.dirname(__FILE__) + "/user_changes_password", :type => RailsStory + # end + def with_steps_for(*tags, &block) + steps = Spec::Story::StepGroup.new do + extend StoryRunnerStepGroupAdapter + end + tags.each {|tag| steps << rspec_story_steps[tag]} + steps.instance_eval(&block) if block + steps + end + + private + + module StoryRunnerStepGroupAdapter + def run(path, options={}) + runner = Spec::Story::Runner::PlainTextStoryRunner.new(path, options) + runner.steps << self + runner.run + end + end + + def rspec_story_steps # :nodoc: + $rspec_story_steps ||= Spec::Story::StepGroupHash.new + end + end end end vendor/plugins/rspec/lib/spec/story/extensions/main.rb @@ -1,12 +1,12 @@ module Spec module Story class GivenScenario - def initialize name + def initialize(name) @name = name end - def perform(instance) - scenario = Runner::StoryRunner.scenario_from_current_story @name + def perform(instance, ignore_name) + scenario = Runner::StoryRunner.scenario_from_current_story(@name) Runner::ScenarioRunner.new.run(scenario, instance) end end vendor/plugins/rspec/lib/spec/story/given_scenario.rb @@ -1,48 +1,59 @@ require 'spec/story/runner/scenario_collector.rb' require 'spec/story/runner/scenario_runner.rb' require 'spec/story/runner/story_runner.rb' +require 'spec/story/runner/story_parser.rb' +require 'spec/story/runner/story_mediator.rb' +require 'spec/story/runner/plain_text_story_runner.rb' module Spec module Story module Runner class << self - def run_options - @run_options ||= ::Spec::Runner::OptionParser.parse(ARGV, $stderr, $stdout) + def run_options # :nodoc: + rspec_options + # @run_options ||= ::Spec::Runner::OptionParser.parse(ARGV, $stderr, $stdout) end - def story_runner + def story_runner # :nodoc: unless @story_runner - scenario_runner = ScenarioRunner.new - Runner.register_exit_hook - world_creator = World - @story_runner = StoryRunner.new(scenario_runner, world_creator) - unless run_options.dry_run - reporter = ::Spec::Story::Reporter::PlainTextReporter.new($stdout) - scenario_runner.add_listener(reporter) - @story_runner.add_listener(reporter) - end - if not run_options.formatters.empty? - documenter = ::Spec::Story::Documenter::PlainTextDocumenter.new($stdout) - scenario_runner.add_listener(documenter) - @story_runner.add_listener(documenter) - world_creator.add_listener(documenter) + @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 register_exit_hook - # TODO - when story runner uses test/unit runners like example runner does we can kill - # this and also the assorted Kernel.stub!(:at_exit) in examples + 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 - Runner.story_runner.run_stories unless $! + exit Runner.story_runner.run_stories unless $! end - # TODO exit with non-zero status if run fails end def dry_run run_options.dry_run end + end end end vendor/plugins/rspec/lib/spec/story/runner.rb @@ -7,17 +7,22 @@ module Spec end def run(scenario, world) - begin - raise Spec::DSL::ExamplePendingError unless scenario.body - @listeners.each { |l| l.scenario_started(scenario.story.title, scenario.name) } - run_story_ignoring_scenarios(scenario.story, world) - world.instance_eval(&scenario.body) + @listeners.each { |l| l.scenario_started(scenario.story.title, scenario.name) } + run_story_ignoring_scenarios(scenario.story, world) + + world.start_collecting_errors + world.instance_eval(&scenario.body) + if world.errors.empty? @listeners.each { |l| l.scenario_succeeded(scenario.story.title, scenario.name) } - rescue Spec::DSL::ExamplePendingError => e - @listeners.each { |l| l.scenario_pending(scenario.story.title, scenario.name, e.message) } - rescue StandardError => e - @listeners.each { |l| l.scenario_failed(scenario.story.title, scenario.name, e) } + else + if Spec::Example::ExamplePendingError === (e = world.errors.first) + @listeners.each { |l| l.scenario_pending(scenario.story.title, scenario.name, e.message) } + else + @listeners.each { |l| l.scenario_failed(scenario.story.title, scenario.name, e) } + return false + end end + true end def add_listener(listener) vendor/plugins/rspec/lib/spec/story/runner/scenario_runner.rb @@ -36,7 +36,9 @@ module Spec def run_stories return if @stories.empty? @listeners.each { |l| l.run_started(scenarios.size) } + success = true @stories.each do |story| + story.assign_steps_to(World) @current_story = story @listeners.each { |l| l.story_started(story.title, story.narrative) } scenarios = @scenarios_by_story[story.title] @@ -44,12 +46,15 @@ module Spec type = story[:type] || Object args = story[:args] || [] world = @world_creator.create(type, *args) - world.instance_variable_set :@current_story, story - @scenario_runner.run(scenario, world) + success = success & @scenario_runner.run(scenario, world) end @listeners.each { |l| l.story_ended(story.title, story.narrative) } + World.step_mother.clear end + unique_steps = (World.step_names.collect {|n| Regexp === n ? n.source : n.to_s}).uniq.sort + @listeners.each { |l| l.collected_steps(unique_steps) } @listeners.each { |l| l.run_ended } + return success end def add_listener(listener) vendor/plugins/rspec/lib/spec/story/runner/story_runner.rb @@ -2,21 +2,26 @@ module Spec module Story class StepMother def initialize - @steps = Hash.new do |hsh,type| - hsh[type] = Hash.new do |hsh,name| - SimpleStep.new(name) do - raise Spec::DSL::ExamplePendingError.new("Unimplemented step: #{name}") - end - end - end + @steps = StepGroup.new + end + + def use(new_step_group) + @steps << new_step_group end - def store(type, name, step) - @steps[type][name] = step + def store(type, step) + @steps.add(type, step) end def find(type, name) - @steps[type][name] + if @steps.find(type, name).nil? + @steps.add(type, + Step.new(name) do + raise Spec::Example::ExamplePendingError.new("Unimplemented step: #{name}") + end + ) + end + @steps.find(type, name) end def clear @@ -26,6 +31,7 @@ module Spec def empty? @steps.empty? end + end end end vendor/plugins/rspec/lib/spec/story/step_mother.rb @@ -17,6 +17,23 @@ module Spec def run_in(obj) obj.instance_eval(&@body) end + + def assign_steps_to(assignee) + if steps=@params[:steps_for] + steps = [steps] unless steps.is_a?(Array) + steps.each do |step| + if step.is_a?(StepGroup) + assignee.use(step) + else + assignee.use(steps_for(step)) + end + end + end + end + + def steps_for(key) + $rspec_story_steps[key] + end end end end vendor/plugins/rspec/lib/spec/story/story.rb @@ -1,7 +1,6 @@ -require 'rubygems' require 'spec/expectations' require 'spec/matchers' -require 'spec/dsl/supports_pending' +require 'spec/example/pending' module Spec module Story @@ -14,7 +13,7 @@ module Spec blocks. =end module World - include ::Spec::DSL::SupportsPending + 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 @@ -35,32 +34,70 @@ module Spec def step_mother @step_mother ||= StepMother.new end + + def use(steps) + step_mother.use(steps) + end - # TODO: investigate duplication between #run_with_suspended_listeners and #store_and_call - - def run_with_suspended_listeners(instance, type, name, step) - current_listeners = Array.new(@listeners) + 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_step(type, name) } + listeners.each { |l| l.found_scenario(type, name) } @listeners.clear - step.perform(instance) unless ::Spec::Story::Runner.dry_run + scenario.perform(world, name) unless ::Spec::Story::Runner.dry_run ensure @listeners.replace(current_listeners) end end - def store_and_call(instance, type, name, *args, &block) + def store_and_call(world, type, name, *args, &block) if block_given? - step_mother.store(type, name, SimpleStep.new(name, &block)) + step_mother.store(type, Step.new(name, &block)) end step = step_mother.find(type, name) - listeners.each { |l| l.found_step(type, name, *args) } - step.perform(instance, *args) unless ::Spec::Story::Runner.dry_run + + 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 ::Spec::Story::Runner.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 + + def errors + @errors ||= [] end + end # end of class << self + + def start_collecting_errors + errors.clear + end + + def errors + World.errors end def GivenScenario(name) - World.run_with_suspended_listeners(self, :'given scenario', name, GivenScenario.new(name)) + World.run_given_scenario_with_suspended_listeners(self, :'given scenario', name, GivenScenario.new(name)) @__previous_step = :given end vendor/plugins/rspec/lib/spec/story/world.rb @@ -1,23 +1,22 @@ - module Spec - module VERSION - unless defined? MAJOR - MAJOR = 1 - MINOR = 0 - TINY = 9 - RELEASE_CANDIDATE = nil - - # RANDOM_TOKEN: 0.188978346552575 - REV = "$LastChangedRevision: 2691 $".match(/LastChangedRevision: (\d+)/)[1] - - 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('.')} (r#{REV})" - - 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 = 3 + RELEASE_CANDIDATE = nil + + BUILD_TIME_UTC = 20080418033155 + + 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 + vendor/plugins/rspec/lib/spec/version.rb @@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "s module Spec module Plugins module MockFramework - include Spec::Mocks::SpecMethods + include Spec::Mocks::ExampleMethods def setup_mocks_for_rspec $rspec_mocks ||= Spec::Mocks::Space.new end vendor/plugins/rspec/plugins/mock_frameworks/rspec.rb @@ -7,6 +7,7 @@ ant # put JRuby's bin dir on your PATH jruby -S gem install rake --no-ri --no-rdoc jruby -S gem install diff-lcs +jruby -S gem install syntax cd ../testsuites/rspec mkdir target jruby -S rake checkout_code vendor/plugins/rspec/spec/README.jruby @@ -39,23 +39,27 @@ HERE describe Rspec, "rspec_commands" do it "should contain the various commands, ordered by preference" do - Rspec.new.spec_commands.should == ["bin/spec", "#{Config::CONFIG['bindir']}/spec"] + Rspec.new.spec_commands.should == [ + File.expand_path("#{File.dirname(__FILE__)}/../../bin/spec"), + "#{Config::CONFIG['bindir']}/spec" + ] end end describe Rspec, "selection of rspec command" do include AutotestHelper - before :each do + before(:each) do common_setup - @rspec_autotest = Rspec.new(@kernel) + @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 - File.should_receive(:exists?).with("bin/spec").and_return true - @rspec_autotest.spec_command.should == "bin/spec" + 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 @@ -79,26 +83,28 @@ HERE describe Rspec, "selection of rspec command (windows compatibility issues)" do include AutotestHelper - before :each do + before(:each) do common_setup end it "should use the ALT_SEPARATOR if it is non-nil" do - @rspec_autotest = Rspec.new(@kernel, @posix_separator, @windows_alt_separator) - @rspec_autotest.stub!(:spec_commands).and_return [File.join('bin', 'spec')] - @rspec_autotest.spec_command.should == "bin\\spec" + @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(@kernel, @posix_separator, @windows_alt_separator) - @rspec_autotest.stub!(:spec_commands).and_return [File.join('bin', 'spec')] - @rspec_autotest.spec_command.should == "bin/spec" + @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 Rspec, "adding spec.opts --options" do - before :each do + before(:each) do @rspec_autotest = Rspec.new end @@ -114,7 +120,7 @@ HERE end describe Rspec do - before :each do + before(:each) do @rspec_autotest = Rspec.new @rspec_autotest.stub!(:ruby).and_return "ruby" @rspec_autotest.stub!(:add_options_if_present).and_return "-O spec/spec.opts" @@ -136,122 +142,55 @@ HERE end end - describe Rspec, "test mappings" do - before :each do - @proc = mock Proc - @kernel = mock Kernel - @kernel.stub!(:proc).and_return @proc - @rspec_autotest = Rspec.new(@kernel) - end - - it "should map all filenames in spec/ which end in .rb" do - @rspec_autotest.test_mappings[%r%^spec/.*\.rb$%].should == @proc - end - - it "should map all names in lib which end in .rb to the corresponding ones in spec/" do - @rspec_autotest.test_mappings[%r%^lib/(.*)\.rb$%].should == @proc - end - - it "should find all files in spec/shares/* and the spec helper in spec/spec_helper" do - @rspec_autotest.test_mappings[%r%^spec/(spec_helper|shared/.*)\.rb$%].should == @proc - end - end - - describe Rspec, "handling results" do - include AutotestHelper - - before :each do - common_setup - @rspec_autotest = Rspec.new(@kernel, @posix_separator, @windows_alt_separator) - @rspec_autotest.stub!(:hook) - - @results = mock String - @results.stub!(:scan).and_return "" - end - - it "should call hook(:red) if there are failures" do - @rspec_autotest.stub!(:consolidate_failures).and_return ["spec/some_spec.rb"] - - @rspec_autotest.should_receive(:hook).with(:red) - @rspec_autotest.handle_results(@results) - end - - it "should call hook(:green) if there are no failures" do - @rspec_autotest.stub!(:consolidate_failures).and_return [] - @rspec_autotest.should_receive(:hook).with(:green) - @rspec_autotest.handle_results(@results) - end - end - - describe Rspec, "handling failed results" do - include AutotestHelper + describe Rspec, "mappings" do - before :each do - common_setup - end - - it %(should scan the output into a multi-dimensional array, - consisting of the failing spec's name as the first element, - and the failure as the second) do - @rspec_autotest = Rspec.new - @rspec_autotest.failed_results(@rspec_output).should == [ - [ - "false should be false", - "expected: true,\n got: false (using ==)\n./spec/autotest/rspec_spec.rb:203:" - ] - ] - end - end - - describe Rspec, "specs for a given file" do - before :each do + before(:each) do @lib_file = "lib/something.rb" @spec_file = "spec/something_spec.rb" @rspec_autotest = Rspec.new - - @rspec_autotest.instance_variable_set("@files", {@lib_file => Time.now, @spec_file => Time.now}) - @rspec_autotest.stub!(:find_files_to_test).and_return true + @rspec_autotest.hook :initialize end it "should find the spec file for a given lib file" do - @rspec_autotest.specs_for_file(@lib_file).should == [@spec_file] + @rspec_autotest.should map_specs([@spec_file]).to(@lib_file) end it "should find the spec file if given a spec file" do - @rspec_autotest.specs_for_file(@spec_file).should == [@spec_file] + @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 - @other_file = "lib/some_non_tracked_file" - @rspec_autotest.specs_for_file(@other_file).should == [] + @rspec_autotest.should map_specs([]).to("lib/untracked_file") end end describe Rspec, "consolidating failures" do include AutotestHelper - before :each do + before(:each) do common_setup @rspec_autotest = Rspec.new - @spec_file = "./spec/autotest/rspec_spec.rb" + @spec_file = "spec/autotest/rspec_spec.rb" @rspec_autotest.instance_variable_set("@files", {@spec_file => Time.now}) @rspec_autotest.stub!(:find_files_to_test).and_return true end it "should return no failures if no failures were given in the output" do - @rspec_autotest.stub!(:failed_results).and_return [[]] - @rspec_autotest.consolidate_failures(@rspec_autotest.failed_results).should == {} + @rspec_autotest.consolidate_failures([[]]).should == {} end it "should return a hash with the spec filename => spec name for each failure or error" do - @rspec_autotest.stub!(:failed_results).and_return([ + @rspec_autotest.stub!(:test_files_for).and_return "spec/autotest/rspec_spec.rb" + failures = [ [ "false should be false", - "expected: true,\n got: false (using ==)\n./spec/autotest/rspec_spec.rb:203:" + "expected: true,\n got: false (using ==)\n#{@spec_file}:203:" ] - ]) - @rspec_autotest.consolidate_failures(@rspec_autotest.failed_results).should == {@spec_file => ["false should be false"]} + ] + @rspec_autotest.consolidate_failures(failures).should == { + @spec_file => ["false should be false"] + } end end vendor/plugins/rspec/spec/autotest/rspec_spec.rb @@ -1,4 +1,6 @@ +require "rubygems" require 'autotest' -require File.dirname(__FILE__) + "/../lib/autotest/rspec" - - +dir = File.dirname(__FILE__) +require "#{dir}/spec_helper" +require File.expand_path("#{dir}/../lib/autotest/rspec") +require "#{dir}/autotest_matchers" vendor/plugins/rspec/spec/autotest_helper.rb @@ -1,4 +1,7 @@ -dir = File.dirname(__FILE__) -Dir["#{dir}/**/*_spec.rb"].each do |file| - require file +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 @@ -28,7 +28,25 @@ describe "Diff" do it "should output unified diff of two strings" do expected="foo\nbar\nzap\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nline\n" actual="foo\nzap\nbar\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nanother\nline\n" - expected_diff="\n\n@@ -1,6 +1,6 @@\n foo\n-bar\n zap\n+bar\n this\n is\n soo\n@@ -9,5 +9,6 @@\n equal\n insert\n a\n+another\n line\n" + expected_diff= <<'EOD' + + +@@ -1,6 +1,6 @@ + foo +-zap + bar ++zap + this + is + soo +@@ -9,6 +9,5 @@ + equal + insert + a +-another + line +EOD + diff = @differ.diff_as_string(expected, actual) diff.should eql(expected_diff) end @@ -44,11 +62,11 @@ describe "Diff" do :metasyntactic, "variable", :delta, -- "charlie", -+ "tango", +- "tango", ++ "charlie", :width, -- "quite wide"] -+ "very wide"] +- "very wide"] ++ "quite wide"] EOD @@ -65,8 +83,8 @@ EOD @@ -1,5 +1,5 @@ <Animal name=bob, -- species=giraffe -+ species=tortoise +- species=tortoise ++ species=giraffe > EOD @@ -94,12 +112,12 @@ describe "Diff in context format" do *** 1,5 **** <Animal name=bob, -! species=giraffe +! species=tortoise > --- 1,5 ---- <Animal name=bob, -! species=tortoise +! species=giraffe > EOD vendor/plugins/rspec/spec/spec/expectations/differs/default_spec.rb @@ -1,33 +1,76 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' -class MainObjectImposter - include Spec::Extensions::Main -end - -describe "The main object extended by MainExtensions" do - before(:each) do - @main = MainObjectImposter.new - @original_rspec_options = $rspec_options - $rspec_options = nil - end +module Spec + module Extensions + describe Main do + it_should_behave_like "sandboxed rspec_options" + before(:each) do + @main = Class.new do; include Main; end + end - after do - $rspec_options = @original_rspec_options - end + after(:each) do + $rspec_story_steps = @original_rspec_story_steps + end - it "should create an Options object" do - @main.send(:rspec_options).should be_instance_of(Spec::Runner::Options) - @main.send(:rspec_options).should === $rspec_options - end + it "should create an Options object" do + @main.send(:rspec_options).should be_instance_of(Spec::Runner::Options) + @main.send(:rspec_options).should === $rspec_options + end - specify {@main.should respond_to(:describe)} - specify {@main.should respond_to(:context)} + specify {@main.should respond_to(:describe)} + specify {@main.should respond_to(:context)} - it "should raise when no block given to describe" do - lambda { @main.describe "foo" }.should raise_error(ArgumentError) - end + it "should raise when no block given to describe" do + lambda { @main.describe "foo" }.should raise_error(ArgumentError) + end + + it "should raise when no description given to describe" do + lambda { @main.describe do; end }.should raise_error(ArgumentError) + end + + it "should registered ExampleGroups by default" do + example_group = @main.describe("The ExampleGroup") do end + rspec_options.example_groups.should include(example_group) + end + + it "should not run unregistered ExampleGroups" do + example_group = @main.describe("The ExampleGroup") do + unregister + end + + rspec_options.example_groups.should_not include(example_group) + end + + it "should create a shared ExampleGroup with share_examples_for" do + group = @main.share_examples_for "all things" do end + group.should be_an_instance_of(Spec::Example::SharedExampleGroup) + end + + describe "#share_as" do + before(:each) do + $share_as_examples_example_module_number ||= 1 + $share_as_examples_example_module_number += 1 + t = Time.new.to_i + @group_name = "Group#{$share_as_examples_example_module_number}" + end - it "should raise when no description given to describe" do - lambda { @main.describe do; end }.should raise_error(ArgumentError) + it "should create a shared ExampleGroup" do + group = @main.share_as @group_name do end + group.should be_an_instance_of(Spec::Example::SharedExampleGroup) + end + + it "should create a constant that points to a Module" do + group = @main.share_as @group_name do end + Object.const_get(@group_name).should equal(group) + end + + it "should bark if you pass it something not-constantizable" do + lambda do + @group = @main.share_as "Non Constant" do end + end.should raise_error(NameError, /The first argument to share_as must be a legal name for a constant/) + end + + end + end end end \ No newline at end of file vendor/plugins/rspec/spec/spec/extensions/main_spec.rb @@ -199,6 +199,21 @@ describe "should be ===" do end end +describe "should be" do + it "should pass if actual is true or a set value" do + true.should be + 1.should be + end + + it "should fail if actual is false" do + lambda {false.should be}.should fail_with("expected if to be satisfied, got false") + end + + it "should fail if actual is nil" do + lambda {nil.should be}.should fail_with("expected if to be satisfied, got nil") + end +end + describe "should be(value)" do it "should pass if actual.equal?(value)" do 5.should be(5) @@ -207,3 +222,27 @@ describe "should be(value)" do lambda { 5.should be(6) }.should fail_with("expected 6, got 5") end end + + +describe "arbitrary predicate with DelegateClass" do + it "should access methods defined in the delegating class (LH[#48])" do + pending(%{ + Looks like DelegateClass is delegating #should to the + delegate. Not sure how to fix this one. Or if we even should." + }) + require 'delegate' + class ArrayDelegate < DelegateClass(Array) + def initialize(array) + @internal_array = array + super(@internal_array) + end + + def large? + @internal_array.size >= 5 + end + end + + delegate = ArrayDelegate.new([1,2,3,4,5,6]) + delegate.should be_large + end +end vendor/plugins/rspec/spec/spec/matchers/be_spec.rb @@ -133,6 +133,93 @@ describe "should change{ block }.by(expected)" do end end +describe "should change(actual, message).by_at_least(expected)" do + before(:each) do + @instance = SomethingExpected.new + @instance.some_value = 5 + end + + it "should pass when attribute is changed by greater than the expected amount" do + lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_least(1) + end + + it "should pass when attribute is changed by the expected amount" do + lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_least(2) + end + + it "should fail when the attribute is changed by less than the expected amount" do + lambda do + lambda { @instance.some_value += 1 }.should change(@instance, :some_value).by_at_least(2) + end.should fail_with("some_value should have been changed by at least 2, but was changed by 1") + end + +end + +describe "should change{ block }.by_at_least(expected)" do + before(:each) do + @instance = SomethingExpected.new + @instance.some_value = 5 + end + + it "should pass when attribute is changed by greater than expected amount" do + lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_least(1) + end + + it "should pass when attribute is changed by the expected amount" do + lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_least(2) + end + + it "should fail when the attribute is changed by less than the unexpected amount" do + lambda do + lambda { @instance.some_value += 1 }.should change{@instance.some_value}.by_at_least(2) + end.should fail_with("result should have been changed by at least 2, but was changed by 1") + end +end + + +describe "should change(actual, message).by_at_most(expected)" do + before(:each) do + @instance = SomethingExpected.new + @instance.some_value = 5 + end + + it "should pass when attribute is changed by less than the expected amount" do + lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_most(3) + end + + it "should pass when attribute is changed by the expected amount" do + lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_most(2) + end + + it "should fail when the attribute is changed by greater than the expected amount" do + lambda do + lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_most(1) + end.should fail_with("some_value should have been changed by at most 1, but was changed by 2") + end + +end + +describe "should change{ block }.by_at_most(expected)" do + before(:each) do + @instance = SomethingExpected.new + @instance.some_value = 5 + end + + it "should pass when attribute is changed by less than expected amount" do + lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_most(3) + end + + it "should pass when attribute is changed by the expected amount" do + lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_most(2) + end + + it "should fail when the attribute is changed by greater than the unexpected amount" do + lambda do + lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_most(1) + end.should fail_with("result should have been changed by at most 1, but was changed by 2") + end +end + describe "should change(actual, message).from(old)" do before(:each) do @instance = SomethingExpected.new vendor/plugins/rspec/spec/spec/matchers/change_spec.rb @@ -1,14 +1,10 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' describe "Matchers should be able to generate their own descriptions" do - before(:each) do - Spec::Matchers.clear_generated_description - end - after(:each) do Spec::Matchers.clear_generated_description end - + it "should == expected" do "this".should == "this" Spec::Matchers.generated_description.should == "should == \"this\"" vendor/plugins/rspec/spec/spec/matchers/description_generation_spec.rb @@ -1,27 +1,5 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' -# NOTE - this was initially handled by an explicit matcher, but is now -# handled by a default set of predicate_matchers. - -# 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." -# end -# end -# def exist; Exist.new; end -# end -# end - - class Substance def initialize exists, description @exists = exists @@ -45,31 +23,35 @@ class SubstanceTester end end -describe "should exist" do +describe "should exist," do + before(:each) do @real = Substance.new true, 'something real' @imaginary = Substance.new false, 'something imaginary' end + + describe "within an example group" do - it "should pass if target exists" do - @real.should exist - end + it "should pass if target exists" do + @real.should exist + end - it "should fail if target does not exist" do - lambda { @imaginary.should exist }. - should fail + it "should fail if target does not exist" do + lambda { @imaginary.should exist }.should fail + end + + it "should pass if target doesn't exist" do + lambda { @real.should_not exist }.should fail + end end -end -describe "should exist, outside of a behavior" do - before(:each) do - @real = Substance.new true, 'something real' - @imaginary = Substance.new false, 'something imaginary' - end - it "should pass if target exists" do - pending("need to either find a way to include stock predicate matchers in Spec::Matchers or add Bret's Exist matcher") do + describe "outside of an example group" do + + it "should pass if target exists" do real_tester = SubstanceTester.new @real real_tester.should_exist end + end + end vendor/plugins/rspec/spec/spec/matchers/exist_spec.rb @@ -16,6 +16,14 @@ describe "should have_sym(*args)" do Object.new.should have_key(:a) }.should raise_error(NoMethodError) end + + it "should reraise an exception thrown in #has_sym?(*args)" do + o = Object.new + def o.has_sym?(*args) + raise "Funky exception" + end + lambda { o.should have_sym(:foo) }.should raise_error("Funky exception") + end end describe "should_not have_sym(*args)" do @@ -34,4 +42,12 @@ describe "should_not have_sym(*args)" do Object.new.should have_key(:a) }.should raise_error(NoMethodError) end + + it "should reraise an exception thrown in #has_sym?(*args)" do + o = Object.new + def o.has_sym?(*args) + raise "Funky exception" + end + lambda { o.should_not have_sym(:foo) }.should raise_error("Funky exception") + end end vendor/plugins/rspec/spec/spec/matchers/has_spec.rb @@ -47,6 +47,25 @@ describe "should have(n).items" do end end +describe 'should have(1).item when Inflector is defined' do + include HaveSpecHelper + + before do + unless Object.const_defined?(:Inflector) + class Inflector + def self.pluralize(string) + string.to_s + 's' + end + end + end + end + + it 'should pluralize the collection name' do + owner = create_collection_owner_with(1) + owner.should have(1).item + end +end + describe "should have(n).items where result responds to items but returns something other than a collection" do it "should provide a meaningful error" do owner = Class.new do @@ -250,7 +269,7 @@ describe "have(n).items where target IS a collection" do [1,2,3].should have(3).items end - it "should reference the number of items IN the collection" do + it "should fail when the number of items IN the collection is not as expected" do lambda { [1,2,3].should have(7).items }.should fail_with("expected 7 items, got 3") end end vendor/plugins/rspec/spec/spec/matchers/have_spec.rb @@ -5,12 +5,12 @@ describe "should match(expected)" do "string".should match(/tri/) end - it "should fail when target (String) matches expected (Regexp)" do + it "should fail when target (String) does not match expected (Regexp)" do lambda { "string".should match(/rings/) }.should fail end - + it "should provide message, expected and actual on failure" do matcher = match(/rings/) matcher.matches?("string") @@ -19,7 +19,7 @@ describe "should match(expected)" do end describe "should_not match(expected)" do - it "should pass when target (String) matches expected (Regexp)" do + it "should pass when target (String) matches does not match (Regexp)" do "string".should_not match(/rings/) end vendor/plugins/rspec/spec/spec/matchers/match_spec.rb @@ -19,6 +19,6 @@ describe "The boolean() mock argument constraint matcher" do end describe "The an_instance_of() mock argument constraint matcher" do - # NOTE - this is implemented as a predicate_matcher - see behaviour.rb + # NOTE - this is implemented as a predicate_matcher - see example_group_methods.rb specify { an_instance_of(String).should == "string" } end vendor/plugins/rspec/spec/spec/matchers/mock_constraint_matchers_spec.rb @@ -28,6 +28,9 @@ describe "should raise_error(message)" do it "should pass if RuntimeError is raised with the right message" do lambda {raise 'blah'}.should raise_error('blah') end + it "should pass if RuntimeError is raised with a matching message" do + lambda {raise 'blah'}.should raise_error(/blah/) + end it "should pass if any other error is raised with the right message" do lambda {raise NameError.new('blah')}.should raise_error('blah') end @@ -73,11 +76,17 @@ describe "should raise_error(NamedError)" do }.should fail_with("expected NameError but nothing was raised") end - it "should fail if another error is raised" do + it "should fail if another error is raised (NameError)" do lambda { lambda { raise }.should raise_error(NameError) }.should fail_with("expected NameError, got RuntimeError") end + + it "should fail if another error is raised (NameError)" do + lambda { + lambda { load "non/existent/file" }.should raise_error(NameError) + }.should fail_with(/expected NameError, got #<LoadError/) + end end describe "should_not raise_error(NamedError)" do @@ -120,6 +129,127 @@ describe "should raise_error(NamedError, error_message) with String" do end end +describe "should raise_error(NamedError, error_message) { |err| ... }" do + it "should yield exception if named error is raised with same message" do + ran = false + + lambda { + raise "example message" + }.should raise_error(RuntimeError, "example message") { |err| + ran = true + err.class.should == RuntimeError + err.message.should == "example message" + } + + ran.should == true + end + + it "yielded block should be able to fail on it's own right" do + ran, passed = false, false + + lambda { + lambda { + raise "example message" + }.should raise_error(RuntimeError, "example message") { |err| + ran = true + 5.should == 4 + passed = true + } + }.should fail_with(/expected: 4/m) + + ran.should == true + passed.should == false + end + + it "should NOT yield exception if no error was thrown" do + ran = false + + lambda { + lambda {}.should raise_error(RuntimeError, "example message") { |err| + ran = true + } + }.should fail_with("expected RuntimeError with \"example message\" but nothing was raised") + + ran.should == false + end + + it "should not yield exception if error class is not matched" do + ran = false + + lambda { + lambda { + raise "example message" + }.should raise_error(SyntaxError, "example message") { |err| + ran = true + } + }.should fail_with("expected SyntaxError with \"example message\", got #<RuntimeError: example message>") + + ran.should == false + end + + it "should NOT yield exception if error message is not matched" do + ran = false + + lambda { + lambda { + raise "example message" + }.should raise_error(RuntimeError, "different message") { |err| + ran = true + } + }.should fail_with("expected RuntimeError with \"different message\", got #<RuntimeError: example message>") + + ran.should == false + end +end + +describe "should_not raise_error(NamedError, error_message) { |err| ... }" do + it "should pass if nothing is raised" do + ran = false + + lambda {}.should_not raise_error(RuntimeError, "example message") { |err| + ran = true + } + + ran.should == false + end + + it "should pass if a different error is raised" do + ran = false + + lambda { raise }.should_not raise_error(NameError, "example message") { |err| + ran = true + } + + ran.should == false + end + + it "should pass if same error is raised with different message" do + ran = false + + lambda { + raise RuntimeError.new("not the example message") + }.should_not raise_error(RuntimeError, "example message") { |err| + ran = true + } + + ran.should == false + end + + it "should fail if named error is raised with same message" do + ran = false + + lambda { + lambda { + raise "example message" + }.should_not raise_error(RuntimeError, "example message") { |err| + ran = true + } + }.should fail_with("expected no RuntimeError with \"example message\", got #<RuntimeError: example message>") + + ran.should == false + end +end + describe "should_not raise_error(NamedError, error_message) with String" do it "should pass if nothing is raised" do lambda {}.should_not raise_error(RuntimeError, "example message") vendor/plugins/rspec/spec/spec/matchers/raise_error_spec.rb @@ -21,6 +21,11 @@ module Spec matcher.matches?("other") matcher.negative_failure_message.should =~ /expected not to get \"thing\", but got \"other\"/ end + + it "should provide a description" do + matcher = simple_matcher("thing") do end + matcher.description.should =="thing" + end end end end \ No newline at end of file vendor/plugins/rspec/spec/spec/matchers/simple_matcher_spec.rb @@ -1,6 +1,8 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' class LiarLiarPantsOnFire + include Spec::MetaClass + extend Spec::MetaClass def respond_to?(sym) true end vendor/plugins/rspec/spec/spec/mocks/bug_report_11545_spec.rb @@ -12,7 +12,7 @@ describe "An object where respond_to? is true and does not have method" do # The fix was to keep track of whether :respond_to? had been proxied and, if # so, call the munged copy of :respond_to? on the object. - it "should not raise an exception" do + it "should not raise an exception for Object" do obj = Object.new obj.should_receive(:respond_to?).with(:foobar).and_return(true) obj.should_receive(:foobar).and_return(:baz) @@ -20,7 +20,7 @@ describe "An object where respond_to? is true and does not have method" do obj.foobar.should == :baz end - it "should not raise an exception" do + it "should not raise an exception for mock" do obj = mock("obj") obj.should_receive(:respond_to?).with(:foobar).and_return(true) obj.should_receive(:foobar).and_return(:baz) vendor/plugins/rspec/spec/spec/mocks/bug_report_8165_spec.rb @@ -75,6 +75,14 @@ module Spec @mock.msg(37) end.should raise_error(MockExpectationError, "Mock 'test mock' expected :msg with (no args) but received it with (37)") end + + it "should fail hash_including with missing key" do + lambda do + @mock.should_receive(:msg).with(hash_including(:a => 1)) + @mock.msg({}) + end.should raise_error(MockExpectationError, "Mock 'test mock' expected :msg with (hash_including(:a=>1)) but received it with ({})") + end + end describe "failing deprecated MockArgumentConstraints" do vendor/plugins/rspec/spec/spec/mocks/failing_mock_argument_constraints_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' module Spec module Mocks - describe "a Mock expectation" do + describe Mock do before(:each) do @mock = mock("test mock") @@ -18,7 +18,8 @@ module Spec @mock.rspec_verify violated rescue MockExpectationError => e - e.backtrace[0].should match(/#{File.basename(__FILE__)}:#{expected_error_line}$/) + # NOTE - this regexp ended w/ $, but jruby adds extra info at the end of the line + e.backtrace[0].should match(/#{File.basename(__FILE__)}:#{expected_error_line}/) end end @@ -36,18 +37,16 @@ module Spec it "should fail when receiving message specified as not to be received" do @mock.should_not_receive(:not_expected) - @mock.not_expected lambda { - @mock.rspec_verify + @mock.not_expected violated - }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected with (any args) 0 times, but received it once") + }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected with (no args) 0 times, but received it once") end it "should fail when receiving message specified as not to be received with args" do @mock.should_not_receive(:not_expected).with("unexpected text") - @mock.not_expected("unexpected text") lambda { - @mock.rspec_verify + @mock.not_expected("unexpected text") violated }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected with (\"unexpected text\") 0 times, but received it once") end @@ -76,7 +75,7 @@ module Spec @mock.rspec_verify end - it "should raise exception if args dont match when method called" do + it "should raise exception if args don't match when method called" do @mock.should_receive(:something).with("a","b","c").and_return("booh") lambda { @mock.something("a","d","c") @@ -84,6 +83,24 @@ module Spec }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (\"a\", \"b\", \"c\") but received it with (\"a\", \"d\", \"c\")") end + it "should raise exception if args don't match when method called even when the method is stubbed" do + @mock.stub!(:something) + @mock.should_receive(:something).with("a","b","c") + lambda { + @mock.something("a","d","c") + @mock.rspec_verify + }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (\"a\", \"b\", \"c\") but received it with (\"a\", \"d\", \"c\")") + end + + it "should raise exception if args don't match when method called even when using null_object" do + @mock = mock("test mock", :null_object => true) + @mock.should_receive(:something).with("a","b","c") + lambda { + @mock.something("a","d","c") + @mock.rspec_verify + }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (\"a\", \"b\", \"c\") but received it with (\"a\", \"d\", \"c\")") + end + it "should fail if unexpected method called" do lambda { @mock.something("a","b","c") @@ -109,23 +126,19 @@ module Spec end it "should fail right away when method defined as never is received" do - pending "Used to pass (false positive). Which one is wrong, the spec or the actual behavior?" - @mock.should_receive(:not_expected).never lambda { @mock.not_expected - }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected 0 times, but received it 1 times") + }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected with (no args) 0 times, but received it once") end it "should eventually fail when method defined as never is received" do @mock.should_receive(:not_expected).never - @mock.not_expected - lambda { - @mock.rspec_verify - }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected with (any args) 0 times, but received it once") + @mock.not_expected + }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected with (no args) 0 times, but received it once") end - + it "should raise when told to" do @mock.should_receive(:something).and_raise(RuntimeError) lambda do @@ -185,14 +198,20 @@ module Spec @mock.something 1 }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (no args) but received it with (1)") end - + it "should fail when args are expected but none are received" do @mock.should_receive(:something).with(1) lambda { @mock.something }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (1) but received it with (no args)") end - + + it "should return value from block by default" do + @mock.stub!(:method_that_yields).and_yield + @mock.method_that_yields { :returned_obj }.should == :returned_obj + @mock.rspec_verify + end + it "should yield 0 args to blocks that take a variable number of arguments" do @mock.should_receive(:yield_back).with(no_args()).once.and_yield a = nil @@ -237,7 +256,7 @@ module Spec a.should == [99, 27, "go"] @mock.rspec_verify end - + it "should yield many args 3 times consecutively to blocks that take a variable number of arguments" do @mock.should_receive(:yield_back).once.with(no_args()).once.and_yield(99, :green, "go"). and_yield("wait", :amber). @@ -346,7 +365,7 @@ module Spec mock.rspec_reset mock.rspec_verify #should throw if reset didn't work end - + it "should work even after method_missing starts raising NameErrors instead of NoMethodErrors" do # Object#method_missing throws either NameErrors or NoMethodErrors. # @@ -375,8 +394,33 @@ module Spec lambda { @mock.foobar }.should_not raise_error(NameError) lambda { @mock.foobar }.should raise_error(MockExpectationError) end + + it "should temporarily replace a method stub on a mock" do + @mock.stub!(:msg).and_return(:stub_value) + @mock.should_receive(:msg).with(:arg).and_return(:mock_value) + @mock.msg(:arg).should equal(:mock_value) + @mock.msg.should equal(:stub_value) + @mock.msg.should equal(:stub_value) + @mock.rspec_verify + end + + it "should temporarily replace a method stub on a non-mock" do + non_mock = Object.new + non_mock.stub!(:msg).and_return(:stub_value) + non_mock.should_receive(:msg).with(:arg).and_return(:mock_value) + non_mock.msg(:arg).should equal(:mock_value) + non_mock.msg.should equal(:stub_value) + non_mock.msg.should equal(:stub_value) + non_mock.rspec_verify + end + + it "should assign stub return values" do + mock = Mock.new('name', :message => :response) + mock.message.should == :response + end + end - + describe "a mock message receiving a block" do before(:each) do @mock = mock("mock") @@ -389,60 +433,60 @@ module Spec it "should call the block after #should_receive" do @mock.should_receive(:foo) { add_call } - + @mock.foo - + @calls.should == 1 end - + it "should call the block after #once" do @mock.should_receive(:foo).once { add_call } - + @mock.foo - + @calls.should == 1 end - + it "should call the block after #twice" do @mock.should_receive(:foo).twice { add_call } - + @mock.foo @mock.foo - + @calls.should == 2 end - + it "should call the block after #times" do @mock.should_receive(:foo).exactly(10).times { add_call } (1..10).each { @mock.foo } - + @calls.should == 10 end - + it "should call the block after #any_number_of_times" do @mock.should_receive(:foo).any_number_of_times { add_call } (1..7).each { @mock.foo } - + @calls.should == 7 end - + it "should call the block after #with" do @mock.should_receive(:foo).with(:arg) { add_call } @mock.foo(:arg) - + @calls.should == 1 end - + it "should call the block after #ordered" do @mock.should_receive(:foo).ordered { add_call } @mock.should_receive(:bar).ordered { add_call } @mock.foo @mock.bar - + @calls.should == 2 end end vendor/plugins/rspec/spec/spec/mocks/mock_spec.rb @@ -3,39 +3,42 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' module Spec module Mocks describe "calling :should_receive with an options hash" do + it_should_behave_like "sandboxed rspec_options" + attr_reader :reporter, :example_group before do - @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new) - @reporter = ::Spec::Runner::Reporter.new(@options) - @behaviour = Class.new(::Spec::DSL::Example).describe("My Behaviour") + @reporter = ::Spec::Runner::Reporter.new(options) + @example_group = Class.new(::Spec::Example::ExampleGroup) do + plugin_mock_framework + describe("Some Examples") + end + reporter.add_example_group example_group end it "should report the file and line submitted with :expected_from" do - example_definition = @behaviour.create_example_definition "spec" do + example_definition = example_group.it "spec" do mock = Spec::Mocks::Mock.new("a mock") mock.should_receive(:message, :expected_from => "/path/to/blah.ext:37") mock.rspec_verify end - example = @behaviour.new(example_definition) - proxy = ::Spec::DSL::ExampleRunner.new(@options, example) + example = example_group.new(example_definition) - @reporter.should_receive(:example_finished) do |spec, error| + reporter.should_receive(:example_finished) do |spec, error| error.backtrace.detect {|line| line =~ /\/path\/to\/blah.ext:37/}.should_not be_nil end - proxy.run + example.execute(options, {}) end it "should use the message supplied with :message" do - example_definition = @behaviour.create_example_definition "spec" do + example_definition = @example_group.it "spec" do mock = Spec::Mocks::Mock.new("a mock") mock.should_receive(:message, :message => "recebi nada") mock.rspec_verify end - example = @behaviour.new(example_definition) - proxy = ::Spec::DSL::ExampleRunner.new(@options, example) + example = @example_group.new(example_definition) @reporter.should_receive(:example_finished) do |spec, error| error.message.should == "recebi nada" end - proxy.run + example.execute(@options, {}) end end end vendor/plugins/rspec/spec/spec/mocks/options_hash_spec.rb @@ -21,11 +21,11 @@ module Spec end it "should_not_receive should mock out the method" do + pending("example raises the expected error, yet fails") @object.should_not_receive(:fuhbar) - @object.fuhbar lambda do - @object.rspec_verify - end.should raise_error(Spec::Mocks::MockExpectationError) + @object.fuhbar + end.should raise_error(MockExpectationError, "Mock 'Object' expected :fuhbar with (no args) 0 times, but received it once") end it "should_not_receive should return a negative message expectation" do @@ -66,10 +66,10 @@ module Spec end it "should_not_receive should also take a String argument" do + pending("example raises the expected error, yet fails") @object.should_not_receive('foobar') - @object.foobar lambda do - @object.rspec_verify + @object.foobar end.should raise_error(Spec::Mocks::MockExpectationError) end vendor/plugins/rspec/spec/spec/mocks/partial_mock_spec.rb @@ -109,6 +109,12 @@ module Spec @mock.should_receive(:random_call).with(no_args) @mock.random_call() end + + it "should match hash with hash_including same hash" do + @mock.should_receive(:random_call).with(hash_including(:a => 1)) + @mock.random_call(:a => 1) + end + end describe Methods, "handling non-constraint arguments" do vendor/plugins/rspec/spec/spec/mocks/passing_mock_argument_constraints_spec.rb @@ -13,106 +13,74 @@ module Spec :original_value end end - @obj = @class.new + @instance = @class.new end - it "should allow for a mock expectation to temporarily replace a method stub on a mock" do - mock = Spec::Mocks::Mock.new("a mock") - mock.stub!(:msg).and_return(:stub_value) - mock.should_receive(:msg).with(:arg).and_return(:mock_value) - mock.msg(:arg).should equal(:mock_value) - mock.msg.should equal(:stub_value) - mock.msg.should equal(:stub_value) - mock.rspec_verify + it "should return expected value when expected message is received" do + @instance.stub!(:msg).and_return(:return_value) + @instance.msg.should equal(:return_value) + @instance.rspec_verify end - it "should allow for a mock expectation to temporarily replace a method stub on a non-mock" do - @obj.stub!(:msg).and_return(:stub_value) - @obj.should_receive(:msg).with(:arg).and_return(:mock_value) - @obj.msg(:arg).should equal(:mock_value) - @obj.msg.should equal(:stub_value) - @obj.msg.should equal(:stub_value) - @obj.rspec_verify + it "should ignore when expected message is received" do + @instance.stub!(:msg) + @instance.msg + lambda do + @instance.rspec_verify + end.should_not raise_error + end + + it "should ignore when message is received with args" do + @instance.stub!(:msg) + @instance.msg(:an_arg) + lambda do + @instance.rspec_verify + end.should_not raise_error end it "should ignore when expected message is not received" do - @obj.stub!(:msg) + @instance.stub!(:msg) lambda do - @obj.rspec_verify + @instance.rspec_verify end.should_not raise_error end - it "should clear itself on rspec_verify" do - @obj.stub!(:this_should_go).and_return(:blah) - @obj.this_should_go.should == :blah - @obj.rspec_verify + it "should clear itself when verified" do + @instance.stub!(:this_should_go).and_return(:blah) + @instance.this_should_go.should == :blah + @instance.rspec_verify lambda do - @obj.this_should_go - end.should raise_error + @instance.this_should_go + end.should raise_error(NameError) end - it "should ignore when expected message is received" do - @obj.stub!(:msg) - @obj.msg - @obj.rspec_verify - end - - it "should ignore when message is received with args" do - @obj.stub!(:msg) - @obj.msg(:an_arg) - @obj.rspec_verify - end - - it "should return expected value when expected message is received" do - @obj.stub!(:msg).and_return(:return_value) - @obj.msg.should equal(:return_value) - @obj.rspec_verify - end - it "should return values in order to consecutive calls" do return_values = ["1",2,Object.new] - @obj.stub!(:msg).and_return(return_values[0],return_values[1],return_values[2]) - @obj.msg.should == return_values[0] - @obj.msg.should == return_values[1] - @obj.msg.should == return_values[2] + @instance.stub!(:msg).and_return(return_values[0],return_values[1],return_values[2]) + @instance.msg.should == return_values[0] + @instance.msg.should == return_values[1] + @instance.msg.should == return_values[2] end it "should keep returning last value in consecutive calls" do return_values = ["1",2,Object.new] - @obj.stub!(:msg).and_return(return_values[0],return_values[1],return_values[2]) - @obj.msg.should == return_values[0] - @obj.msg.should == return_values[1] - @obj.msg.should == return_values[2] - @obj.msg.should == return_values[2] - @obj.msg.should == return_values[2] - end - - it "should revert to original instance method if existed" do - @obj.existing_instance_method.should equal(:original_value) - @obj.stub!(:existing_instance_method).and_return(:mock_value) - @obj.existing_instance_method.should equal(:mock_value) - @obj.rspec_verify - # TODO JRUBY: This causes JRuby to fail with: - # NativeException in 'Stub should revert to original instance method if existed' - # java.lang.ArrayIndexOutOfBoundsException: 0 - # org.jruby.internal.runtime.methods.IterateCallable.internalCall(IterateCallable.java:63) - # org.jruby.internal.runtime.methods.AbstractCallable.call(AbstractCallable.java:64) - # org.jruby.runtime.ThreadContext.yieldInternal(ThreadContext.java:574) - # org.jruby.runtime.ThreadContext.yieldSpecificBlock(ThreadContext.java:549) - # org.jruby.runtime.Block.call(Block.java:158) - # org.jruby.RubyProc.call(RubyProc.java:118) - # org.jruby.internal.runtime.methods.ProcMethod.internalCall(ProcMethod.java:69) - # org.jruby.internal.runtime.methods.AbstractMethod.call(AbstractMethod.java:58) - # org.jruby.RubyObject.callMethod(RubyObject.java:379) - # org.jruby.RubyObject.callMethod(RubyObject.java:331) - # org.jruby.evaluator.EvaluationState.evalInternal(EvaluationState.java:472) - # org.jruby.evaluator.EvaluationState.evalInternal(EvaluationState.java:462) - # org.jruby.evaluator.EvaluationState.evalInternal(EvaluationState.java:390) - # org.jruby.evaluator.EvaluationState.eval(EvaluationState.java:133) - @obj.existing_instance_method.should equal(:original_value) + @instance.stub!(:msg).and_return(return_values[0],return_values[1],return_values[2]) + @instance.msg.should == return_values[0] + @instance.msg.should == return_values[1] + @instance.msg.should == return_values[2] + @instance.msg.should == return_values[2] + @instance.msg.should == return_values[2] + end + + it "should revert to original instance method if there is one" do + @instance.existing_instance_method.should equal(:original_value) + @instance.stub!(:existing_instance_method).and_return(:mock_value) + @instance.existing_instance_method.should equal(:mock_value) + @instance.rspec_verify + @instance.existing_instance_method.should equal(:original_value) end - it "should revert to original class method if existed" do + it "should revert to original class method if there is one" do @class.existing_class_method.should equal(:original_value) @class.stub!(:existing_class_method).and_return(:mock_value) @class.existing_class_method.should equal(:mock_value) @@ -120,45 +88,43 @@ module Spec @class.existing_class_method.should equal(:original_value) end - it "should clear itself on rspec_verify" do - @obj.stub!(:this_should_go).and_return(:blah) - @obj.this_should_go.should == :blah - @obj.rspec_verify - lambda do - @obj.this_should_go - end.should raise_error - end - - it "should support yielding" do - @obj.stub!(:method_that_yields).and_yield(:yielded_value) + it "should yield a specified object" do + @instance.stub!(:method_that_yields).and_yield(:yielded_obj) current_value = :value_before - @obj.method_that_yields {|val| current_value = val} - current_value.should == :yielded_value - @obj.rspec_verify + @instance.method_that_yields {|val| current_value = val} + current_value.should == :yielded_obj + @instance.rspec_verify end - it "should support yielding multiple times" do - @obj.stub!(:method_that_yields_multiple_times).and_yield(:yielded_value). + it "should yield multiple times with multiple calls to and_yield" do + @instance.stub!(:method_that_yields_multiple_times).and_yield(:yielded_value). and_yield(:another_value) current_value = [] - @obj.method_that_yields_multiple_times {|val| current_value << val} + @instance.method_that_yields_multiple_times {|val| current_value << val} current_value.should == [:yielded_value, :another_value] - @obj.rspec_verify + @instance.rspec_verify + end + + it "should yield a specified object and return another specified object" do + yielded_obj = mock("my mock") + yielded_obj.should_receive(:foo).with(:bar) + @instance.stub!(:method_that_yields_and_returns).and_yield(yielded_obj).and_return(:baz) + @instance.method_that_yields_and_returns { |o| o.foo :bar }.should == :baz end it "should throw when told to" do - @mock.stub!(:something).and_throw(:blech) + @mock.stub!(:something).and_throw(:up) lambda do @mock.something - end.should throw_symbol(:blech) + end.should throw_symbol(:up) end - it "should support overriding w/ a new stub" do + it "should override a pre-existing stub" do @stub.stub!(:existing_instance_method).and_return(:updated_stub_value) @stub.existing_instance_method.should == :updated_stub_value end - it "should support stub with" do + it "should limit " do @stub.stub!(:foo).with("bar") @stub.should_receive(:foo).with("baz") @stub.foo("bar") vendor/plugins/rspec/spec/spec/mocks/stub_spec.rb @@ -1,12 +1,14 @@ -require "#{File.dirname(__FILE__)}/../../spec_helper" +require File.dirname(__FILE__) + '/../../spec_helper' +require File.dirname(__FILE__) + '/../../ruby_forker' describe "The bin/spec script" do + include RubyForker + it "should have no warnings" do + pending "Hangs on JRuby" if PLATFORM =~ /java/ spec_path = "#{File.dirname(__FILE__)}/../../../bin/spec" - output = nil - IO.popen("ruby -w #{spec_path} --help 2>&1") do |io| - output = io.read - end + + output = ruby "-w #{spec_path} --help 2>&1" output.should_not =~ /warning/n end end vendor/plugins/rspec/spec/spec/package/bin_spec_spec.rb @@ -1,136 +1,147 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' -describe Spec::Runner::CommandLine, ".run" do - it_should_behave_like "Test::Unit io sink" - - before do - @err = StringIO.new - @out = StringIO.new - end +module Spec + module Runner + describe CommandLine, ".run" do + it_should_behave_like "sandboxed rspec_options" + attr_reader :options, :err, :out + before do + @err = options.error_stream + @out = options.output_stream + end - it "should run directory" do - file = File.dirname(__FILE__) + '/../../../examples' - Spec::Runner::CommandLine.run([file], @err, @out) + it "should run directory" do + file = File.dirname(__FILE__) + '/../../../examples/pure' + Spec::Runner::CommandLine.run(OptionParser.parse([file,"-p","**/*.rb"], @err, @out)) - @out.rewind - @out.read.should =~ /\d+ examples, 0 failures, 3 pending/n - end - - it "should run file" do - file = File.dirname(__FILE__) + '/../../../failing_examples/predicate_example.rb' - Spec::Runner::CommandLine.run([file], @err, @out) + @out.rewind + @out.read.should =~ /\d+ examples, 0 failures, 3 pending/n + end - @out.rewind - @out.read.should =~ /2 examples, 1 failure/n - end + it "should run file" do + file = File.dirname(__FILE__) + '/../../../failing_examples/predicate_example.rb' + Spec::Runner::CommandLine.run(OptionParser.parse([file], @err, @out)) - it "should raise when file does not exist" do - file = File.dirname(__FILE__) + '/doesntexist' + @out.rewind + @out.read.should =~ /2 examples, 1 failure/n + end - lambda { - Spec::Runner::CommandLine.run([file], @err, @out) - }.should raise_error - end - - it "should return true when in --generate-options mode" do - Spec::Runner::CommandLine.run(['--generate-options', '/dev/null'], @err, @out).should be_true - end + it "should raise when file does not exist" do + file = File.dirname(__FILE__) + '/doesntexist' - it "should dump even if Interrupt exception is occurred" do - behaviour = Class.new(::Spec::DSL::Example).describe("behaviour") do - it "no error" do + lambda { + Spec::Runner::CommandLine.run(OptionParser.parse([file], @err, @out)) + }.should raise_error end - it "should interrupt" do - raise Interrupt + it "should return true when in --generate-options mode" do + # NOTE - this used to say /dev/null but jruby hangs on that for some reason + Spec::Runner::CommandLine.run( + OptionParser.parse(['--generate-options', '/tmp/foo'], @err, @out) + ).should be_true end - end - options = ::Spec::Runner::Options.new(@err, @out) - ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options) - options.reporter.should_receive(:dump) - options.add_behaviour(behaviour) - - Spec::Runner::CommandLine.run([], @err, @out) - end + it "should dump even if Interrupt exception is occurred" do + example_group = Class.new(::Spec::Example::ExampleGroup) do + describe("example_group") + it "no error" do + end - it "should heckle when options have heckle_runner" do - behaviour = Class.new(::Spec::DSL::Example).describe("behaviour") do - it "no error" do - end - end - options = ::Spec::Runner::Options.new(@err, @out) - ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options) - options.add_behaviour behaviour + it "should interrupt" do + raise Interrupt, "I'm interrupting" + end + end - heckle_runner = mock("heckle_runner") - heckle_runner.should_receive(:heckle_with) - $rspec_mocks.__send__(:mocks).delete(heckle_runner) + options = ::Spec::Runner::Options.new(@err, @out) + ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options) + options.reporter.should_receive(:dump) + options.add_example_group(example_group) - options.heckle_runner = heckle_runner - options.add_behaviour(behaviour) + Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out)) + end - Spec::Runner::CommandLine.run([], @err, @out) - heckle_runner.rspec_verify - end + it "should heckle when options have heckle_runner" do + example_group = Class.new(::Spec::Example::ExampleGroup).describe("example_group") do + it "no error" do + end + end + options = ::Spec::Runner::Options.new(@err, @out) + ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options) + options.add_example_group example_group - it "should run examples backwards if options.reverse is true" do - options = ::Spec::Runner::Options.new(@err, @out) - ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options) - options.reverse = true + heckle_runner = mock("heckle_runner") + heckle_runner.should_receive(:heckle_with) + $rspec_mocks.__send__(:mocks).delete(heckle_runner) - b1 = Class.new(Spec::DSL::Example) - b2 = Class.new(Spec::DSL::Example) + options.heckle_runner = heckle_runner + options.add_example_group(example_group) - b1_suite = b1.suite - b1.should_receive(:suite).and_return(b1_suite) - b2_suite = b2.suite - b2.should_receive(:suite).and_return(b2_suite) + Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out)) + heckle_runner.rspec_verify + end - b2_suite.should_receive(:run).ordered - b1_suite.should_receive(:run).ordered + it "should run examples backwards if options.reverse is true" do + options = ::Spec::Runner::Options.new(@err, @out) + ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options) + options.reverse = true - options.add_behaviour(b1) - options.add_behaviour(b2) + b1 = Class.new(Spec::Example::ExampleGroup) + b2 = Class.new(Spec::Example::ExampleGroup) - Spec::Runner::CommandLine.run([], @err, @out) - end + b2.should_receive(:run).ordered + b1.should_receive(:run).ordered - it "should pass its Description to the reporter" do - behaviour = Class.new(::Spec::DSL::Example).describe("behaviour") do - it "should" do - end - end + options.add_example_group(b1) + options.add_example_group(b2) - options = ::Spec::Runner::Options.new(@err, @out) - ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options) - options.reporter.should_receive(:add_behaviour).with(an_instance_of(Spec::DSL::BehaviourDescription)) - options.add_behaviour(behaviour) - Spec::Runner::CommandLine.run([], @err, @out) - end + Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out)) + end - it "runs only selected Examples when options.examples is set" do - options = ::Spec::Runner::Options.new(@err, @out) - ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options) + it "should pass its ExampleGroup to the reporter" do + example_group = Class.new(::Spec::Example::ExampleGroup).describe("example_group") do + it "should" do + end + end + options = ::Spec::Runner::Options.new(@err, @out) + options.add_example_group(example_group) + + ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options) + options.reporter.should_receive(:add_example_group).with(example_group) + + Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out)) + end - options.examples << "behaviour should" - should_has_run = false - should_not_has_run = false - behaviour = Class.new(::Spec::DSL::Example).describe("behaviour") do - it "should" do - should_has_run = true + it "runs only selected Examples when options.examples is set" do + options = ::Spec::Runner::Options.new(@err, @out) + ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options) + + options.examples << "example_group should" + should_has_run = false + should_not_has_run = false + example_group = Class.new(::Spec::Example::ExampleGroup).describe("example_group") do + it "should" do + should_has_run = true + end + it "should not" do + should_not_has_run = true + end + end + + options.reporter.should_receive(:add_example_group).with(example_group) + + options.add_example_group example_group + Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out)) + + should_has_run.should be_true + should_not_has_run.should be_false end - it "should not" do - should_not_has_run = true + + it "sets Spec.run to true" do + ::Spec.run = false + ::Spec.should_not be_run + Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out)) + ::Spec.should be_run end end - - options.reporter.should_receive(:add_behaviour).with(an_instance_of(Spec::DSL::BehaviourDescription)) - - options.add_behaviour behaviour - Spec::Runner::CommandLine.run([], @err, @out) - - should_has_run.should be_true - should_not_has_run.should be_false end -end +end \ No newline at end of file vendor/plugins/rspec/spec/spec/runner/command_line_spec.rb @@ -3,12 +3,11 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' module Spec module Runner describe DrbCommandLine, "without running local server" do - it_should_behave_like "Test::Unit io sink" unless Config::CONFIG['ruby_install_name'] == 'jruby' it "should print error when there is no running local server" do err = StringIO.new out = StringIO.new - DrbCommandLine.run(['--version'], err, out) + DrbCommandLine.run(OptionParser.parse(['--version'], err, out)) err.rewind err.read.should =~ /No server is running/ @@ -16,13 +15,12 @@ module Spec end end - class DrbCommandLineSpec < ::Spec::DSL::Example + class DrbCommandLineSpec < ::Spec::Example::ExampleGroup describe DrbCommandLine, "with local server" - it_should_behave_like "Test::Unit io sink" class CommandLineForSpec - def self.run(argv, err, out) - exit Spec::Runner::CommandLine.run(argv, err, out) + def self.run(argv, stderr, stdout) + exit Spec::Runner::CommandLine.run(OptionParser.parse(argv, stderr, stdout)) end end @@ -77,12 +75,14 @@ module Spec end end - def run_spec_via_druby(args) + def run_spec_via_druby(argv) err, out = StringIO.new, StringIO.new out.instance_eval do def tty?; true end end - Spec::Runner::DrbCommandLine.run(args, err, out) + options = ::Spec::Runner::Options.new(err, out) + options.argv = argv + Spec::Runner::DrbCommandLine.run(options) out.rewind; out.read end end vendor/plugins/rspec/spec/spec/runner/drb_command_line_spec.rb @@ -7,7 +7,13 @@ describe "ExecutionContext" do dt.should be_an_instance_of(Spec::Mocks::DuckTypeArgConstraint) dt.matches?([]).should be_true end - + + it "should provide hash_including" do + hi = hash_including(:a => 1) + hi.should be_an_instance_of(Spec::Mocks::HashIncludingConstraint) + hi.matches?(:a => 1).should be_true + end + it "should violate when violated()" do lambda do violated vendor/plugins/rspec/spec/spec/runner/execution_context_spec.rb @@ -1,26 +1,29 @@ require File.dirname(__FILE__) + '/../../../spec_helper' +require 'spec/runner/formatter/failing_examples_formatter' module Spec module Runner module Formatter - describe "FailingExamplesFormatter" do + describe FailingExamplesFormatter do before(:each) do @io = StringIO.new - @options = Options.new(StringIO.new, @io) - @formatter = @options.create_formatter(FailingExamplesFormatter) - @behaviour = Class.new(::Spec::DSL::Example).describe("My Behaviour") + options = mock('options') + @formatter = FailingExamplesFormatter.new(options, @io) end it "should add example name for each failure" do - @formatter.add_behaviour("b 1") - @formatter.example_failed(@behaviour.create_example_definition("e 1"), nil, Reporter::Failure.new(nil, RuntimeError.new)) - @formatter.add_behaviour("b 2") - @formatter.example_failed(@behaviour.create_example_definition("e 2"), nil, Reporter::Failure.new(nil, RuntimeError.new)) - @formatter.example_failed(@behaviour.create_example_definition("e 3"), nil, Reporter::Failure.new(nil, RuntimeError.new)) + example_group_1 = Class.new(ExampleGroup).describe("A") + example_group_2 = Class.new(example_group_1).describe("B") + + @formatter.add_example_group(example_group_1) + @formatter.example_failed(example_group_1.it("a1"){}, nil, Reporter::Failure.new(nil, RuntimeError.new)) + @formatter.add_example_group(example_group_2) + @formatter.example_failed(example_group_2.it("b2"){}, nil, Reporter::Failure.new(nil, RuntimeError.new)) + @formatter.example_failed(example_group_2.it("b3"){}, nil, Reporter::Failure.new(nil, RuntimeError.new)) @io.string.should eql(<<-EOF -b 1 e 1 -b 2 e 2 -b 2 e 3 +A a1 +A B b2 +A B b3 EOF ) end vendor/plugins/rspec/spec/spec/runner/formatter/failing_examples_formatter_spec.rb @@ -73,7 +73,7 @@ function makeYellow(element_id) { font-size: 1.2em; } -.behaviour { +.example_group { margin: 0 10px 5px; background: #fff; } @@ -176,21 +176,21 @@ a { </div> <div class="results"> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_1">Mocker</dt> + <dt id="example_group_1">Mocker</dt> <script type="text/javascript">moveProgressBar('5.8');</script> <dd class="spec passed"><span class="passed_spec_name">should be able to call mock()</span></dd> <script type="text/javascript">makeRed('rspec-header');</script> - <script type="text/javascript">makeRed('behaviour_1');</script> + <script type="text/javascript">makeRed('example_group_1');</script> <script type="text/javascript">moveProgressBar('11.7');</script> <dd class="spec failed"> <span class="failed_spec_name">should fail when expected message not received</span> <div class="failure" id="failure_1"> <div class="message"><pre>Mock 'poke me' expected :poke with (any args) once, but received it 0 times</pre></div> <div class="backtrace"><pre>./failing_examples/mocking_example.rb:13: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> +./spec/spec/runner/formatter/html_formatter_spec.rb:24: +./spec/spec/runner/formatter/html_formatter_spec.rb:20:</pre></div> <pre class="ruby"><code><span class="linenum">11</span> <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should fail when expected message not received</span><span class="punct">&quot;</span> <span class="keyword">do</span> <span class="linenum">12</span> <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">poke me</span><span class="punct">&quot;)</span> <span class="offending"><span class="linenum">13</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:poke</span><span class="punct">)</span></span> @@ -204,8 +204,8 @@ a { <div class="failure" id="failure_2"> <div class="message"><pre>Mock 'one two three' received :three out of order</pre></div> <div class="backtrace"><pre>./failing_examples/mocking_example.rb:22: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> +./spec/spec/runner/formatter/html_formatter_spec.rb:24: +./spec/spec/runner/formatter/html_formatter_spec.rb:20:</pre></div> <pre class="ruby"><code><span class="linenum">20</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:three</span><span class="punct">).</span><span class="ident">ordered</span> <span class="linenum">21</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">one</span> <span class="offending"><span class="linenum">22</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">three</span></span> @@ -219,8 +219,8 @@ a { <div class="failure" id="failure_3"> <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div> <div class="backtrace"><pre>./failing_examples/mocking_example.rb:28: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> +./spec/spec/runner/formatter/html_formatter_spec.rb:24: +./spec/spec/runner/formatter/html_formatter_spec.rb:20:</pre></div> <pre class="ruby"><code><span class="linenum">26</span> <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should get yelled at when sending unexpected messages</span><span class="punct">&quot;</span> <span class="keyword">do</span> <span class="linenum">27</span> <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">don't talk to me</span><span class="punct">&quot;)</span> <span class="offending"><span class="linenum">28</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_not_receive</span><span class="punct">(</span><span class="symbol">:any_message_at_all</span><span class="punct">)</span></span> @@ -234,8 +234,8 @@ a { <div class="failure" id="failure_4"> <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div> <div class="backtrace"><pre>./failing_examples/mocking_example.rb:33: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> +./spec/spec/runner/formatter/html_formatter_spec.rb:24: +./spec/spec/runner/formatter/html_formatter_spec.rb:20:</pre></div> <pre class="ruby"><code><span class="linenum">31</span> <span class="linenum">32</span> <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">has a bug we need to fix</span><span class="punct">&quot;</span> <span class="keyword">do</span> <span class="offending"><span class="linenum">33</span> <span class="ident">pending</span> <span class="punct">&quot;</span><span class="string">here is the bug</span><span class="punct">&quot;</span> <span class="keyword">do</span></span> @@ -245,10 +245,10 @@ a { </dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_2">Running specs with --diff</dt> - <script type="text/javascript">makeRed('behaviour_2');</script> + <dt id="example_group_2">Running specs with --diff</dt> + <script type="text/javascript">makeRed('example_group_2');</script> <script type="text/javascript">moveProgressBar('35.2');</script> <dd class="spec failed"> <span class="failed_spec_name">should print diff of different strings</span> @@ -263,8 +263,8 @@ Diff: framework for Ruby </pre></div> <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:13: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> +./spec/spec/runner/formatter/html_formatter_spec.rb:24: +./spec/spec/runner/formatter/html_formatter_spec.rb:20:</pre></div> <pre class="ruby"><code><span class="linenum">11</span><span class="ident">framework</span> <span class="keyword">for</span> <span class="constant">Ruby</span> <span class="linenum">12</span><span class="constant">EOF</span> <span class="offending"><span class="linenum">13</span> <span class="ident">usa</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="ident">uk</span></span> @@ -293,8 +293,8 @@ Diff: &gt; </pre></div> <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:34: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> +./spec/spec/runner/formatter/html_formatter_spec.rb:24: +./spec/spec/runner/formatter/html_formatter_spec.rb:20:</pre></div> <pre class="ruby"><code><span class="linenum">32</span> <span class="ident">expected</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">giraffe</span><span class="punct">&quot;</span> <span class="linenum">33</span> <span class="ident">actual</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">tortoise</span><span class="punct">&quot;</span> <span class="offending"><span class="linenum">34</span> <span class="ident">expected</span><span class="punct">.</span><span class="ident">should</span> <span class="ident">eql</span><span class="punct">(</span><span class="ident">actual</span><span class="punct">)</span></span> @@ -304,16 +304,16 @@ Diff: </dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_3">A consumer of a stub</dt> + <dt id="example_group_3">A consumer of a stub</dt> <script type="text/javascript">moveProgressBar('47.0');</script> <dd class="spec passed"><span class="passed_spec_name">should be able to stub methods on any Object</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_4">A stubbed method on a class</dt> + <dt id="example_group_4">A stubbed method on a class</dt> <script type="text/javascript">moveProgressBar('52.9');</script> <dd class="spec passed"><span class="passed_spec_name">should return the stubbed value</span></dd> <script type="text/javascript">moveProgressBar('58.8');</script> @@ -322,9 +322,9 @@ Diff: <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_5">A mock</dt> + <dt id="example_group_5">A mock</dt> <script type="text/javascript">moveProgressBar('70.5');</script> <dd class="spec passed"><span class="passed_spec_name">can stub!</span></dd> <script type="text/javascript">moveProgressBar('76.4');</script> @@ -333,28 +333,28 @@ Diff: <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_6">pending example (using pending method)</dt> - <script type="text/javascript">makeYellow('behaviour_6');</script> + <dt id="example_group_6">pending example (using pending method)</dt> + <script type="text/javascript">makeYellow('example_group_6');</script> <script type="text/javascript">moveProgressBar('88.2');</script> - <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: for some reason&quot;</span></dd> + <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_7">pending example (with no block)</dt> - <script type="text/javascript">makeYellow('behaviour_7');</script> + <dt id="example_group_7">pending example (with no block)</dt> + <script type="text/javascript">makeYellow('example_group_7');</script> <script type="text/javascript">moveProgressBar('94.1');</script> - <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: Not Yet Implemented&quot;</span></dd> + <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: Not Yet Implemented&quot; (PENDING: Not Yet Implemented)</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_8">pending example (with block for pending)</dt> - <script type="text/javascript">makeYellow('behaviour_8');</script> + <dt id="example_group_8">pending example (with block for pending)</dt> + <script type="text/javascript">makeYellow('example_group_8');</script> <script type="text/javascript">moveProgressBar('100.0');</script> - <dd class="spec not_implemented"><span class="not_implemented_spec_name">should have a failing block, passed to pending, reported as &quot;PENDING: for some reason&quot;</span></dd> + <dd class="spec not_implemented"><span class="not_implemented_spec_name">should have a failing block, passed to pending, reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd> </dl> </div> <script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>x seconds</strong>";</script> vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.4.html @@ -18,7 +18,6 @@ </style> </head> <body> - <div class="rspec-report"> <script type="text/javascript"> // <![CDATA[ @@ -74,7 +73,7 @@ function makeYellow(element_id) { font-size: 1.2em; } -.behaviour { +.example_group { margin: 0 10px 5px; background: #fff; } @@ -177,22 +176,23 @@ a { </div> <div class="results"> - -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_1">Mocker</dt> + <dt id="example_group_1">Mocker</dt> <script type="text/javascript">moveProgressBar('5.8');</script> <dd class="spec passed"><span class="passed_spec_name">should be able to call mock()</span></dd> <script type="text/javascript">makeRed('rspec-header');</script> - <script type="text/javascript">makeRed('behaviour_1');</script> + <script type="text/javascript">makeRed('example_group_1');</script> <script type="text/javascript">moveProgressBar('11.7');</script> <dd class="spec failed"> <span class="failed_spec_name">should fail when expected message not received</span> <div class="failure" id="failure_1"> <div class="message"><pre>Mock 'poke me' expected :poke with (any args) once, but received it 0 times</pre></div> - <div class="backtrace"><pre>./failing_examples/mocking_example.rb:13: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> + <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:13:in `should_receive' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `instance_eval'</pre></div> <pre class="ruby"><code><span class="linenum">11</span> it "should fail when expected message not received" do <span class="linenum">12</span> mock = mock("poke me") <span class="offending"><span class="linenum">13</span> mock.should_receive(:poke)</span> @@ -206,9 +206,12 @@ a { <span class="failed_spec_name">should fail when messages are received out of order</span> <div class="failure" id="failure_2"> <div class="message"><pre>Mock 'one two three' received :three out of order</pre></div> - <div class="backtrace"><pre>./failing_examples/mocking_example.rb:22: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> + <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:22:in `three' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:16:in `instance_eval' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `instance_eval'</pre></div> <pre class="ruby"><code><span class="linenum">20</span> mock.should_receive(:three).ordered <span class="linenum">21</span> mock.one <span class="offending"><span class="linenum">22</span> mock.three</span> @@ -222,9 +225,11 @@ a { <span class="failed_spec_name">should get yelled at when sending unexpected messages</span> <div class="failure" id="failure_3"> <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div> - <div class="backtrace"><pre>./failing_examples/mocking_example.rb:28: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> + <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:28:in `should_not_receive' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `instance_eval'</pre></div> <pre class="ruby"><code><span class="linenum">26</span> it "should get yelled at when sending unexpected messages" do <span class="linenum">27</span> mock = mock("don't talk to me") <span class="offending"><span class="linenum">28</span> mock.should_not_receive(:any_message_at_all)</span> @@ -238,9 +243,12 @@ a { <span class="failed_spec_name">has a bug we need to fix</span> <div class="failure" id="failure_4"> <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div> - <div class="backtrace"><pre>./failing_examples/mocking_example.rb:33: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> + <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:33:in `pending' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:33:in `instance_eval' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `instance_eval'</pre></div> <pre class="ruby"><code><span class="linenum">31</span> <span class="linenum">32</span> it "has a bug we need to fix" do <span class="offending"><span class="linenum">33</span> pending "here is the bug" do</span> @@ -251,10 +259,10 @@ a { </dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_2">Running specs with --diff</dt> - <script type="text/javascript">makeRed('behaviour_2');</script> + <dt id="example_group_2">Running specs with --diff</dt> + <script type="text/javascript">makeRed('example_group_2');</script> <script type="text/javascript">moveProgressBar('35.2');</script> <dd class="spec failed"> <span class="failed_spec_name">should print diff of different strings</span> @@ -268,10 +276,11 @@ Diff: +behaviour driven development framework for Ruby </pre></div> - <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:13:in `==' -./failing_examples/diffing_spec.rb:13: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> + <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/diffing_spec.rb:13:in `==' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `instance_eval'</pre></div> <pre class="ruby"><code><span class="linenum">11</span>framework for Ruby <span class="linenum">12</span>EOF <span class="offending"><span class="linenum">13</span> usa.should == uk</span> @@ -301,9 +310,12 @@ Diff: +species=tortoise &gt; </pre></div> - <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:34: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> + <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/diffing_spec.rb:34:in `should' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/diffing_spec.rb:31:in `instance_eval' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir' +/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `instance_eval'</pre></div> <pre class="ruby"><code><span class="linenum">32</span> expected = Animal.new "bob", "giraffe" <span class="linenum">33</span> actual = Animal.new "bob", "tortoise" <span class="offending"><span class="linenum">34</span> expected.should eql(actual)</span> @@ -314,16 +326,16 @@ Diff: </dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_3">A consumer of a stub</dt> + <dt id="example_group_3">A consumer of a stub</dt> <script type="text/javascript">moveProgressBar('47.0');</script> <dd class="spec passed"><span class="passed_spec_name">should be able to stub methods on any Object</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_4">A stubbed method on a class</dt> + <dt id="example_group_4">A stubbed method on a class</dt> <script type="text/javascript">moveProgressBar('52.9');</script> <dd class="spec passed"><span class="passed_spec_name">should return the stubbed value</span></dd> <script type="text/javascript">moveProgressBar('58.8');</script> @@ -332,9 +344,9 @@ Diff: <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_5">A mock</dt> + <dt id="example_group_5">A mock</dt> <script type="text/javascript">moveProgressBar('70.5');</script> <dd class="spec passed"><span class="passed_spec_name">can stub!</span></dd> <script type="text/javascript">moveProgressBar('76.4');</script> @@ -343,28 +355,28 @@ Diff: <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_6">pending example (using pending method)</dt> - <script type="text/javascript">makeYellow('behaviour_6');</script> + <dt id="example_group_6">pending example (using pending method)</dt> + <script type="text/javascript">makeYellow('example_group_6');</script> <script type="text/javascript">moveProgressBar('88.2');</script> - <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: for some reason&quot;</span></dd> + <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_7">pending example (with no block)</dt> - <script type="text/javascript">makeYellow('behaviour_7');</script> + <dt id="example_group_7">pending example (with no block)</dt> + <script type="text/javascript">makeYellow('example_group_7');</script> <script type="text/javascript">moveProgressBar('94.1');</script> - <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: Not Yet Implemented&quot;</span></dd> + <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: Not Yet Implemented&quot; (PENDING: Not Yet Implemented)</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_8">pending example (with block for pending)</dt> - <script type="text/javascript">makeYellow('behaviour_8');</script> + <dt id="example_group_8">pending example (with block for pending)</dt> + <script type="text/javascript">makeYellow('example_group_8');</script> <script type="text/javascript">moveProgressBar('100.0');</script> - <dd class="spec not_implemented"><span class="not_implemented_spec_name">should have a failing block, passed to pending, reported as &quot;PENDING: for some reason&quot;</span></dd> + <dd class="spec not_implemented"><span class="not_implemented_spec_name">should have a failing block, passed to pending, reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd> </dl> </div> <script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>x seconds</strong>";</script> vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5-jruby.html @@ -73,7 +73,7 @@ function makeYellow(element_id) { font-size: 1.2em; } -.behaviour { +.example_group { margin: 0 10px 5px; background: #fff; } @@ -176,13 +176,13 @@ a { </div> <div class="results"> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_1">Mocker</dt> + <dt id="example_group_1">Mocker</dt> <script type="text/javascript">moveProgressBar('5.8');</script> <dd class="spec passed"><span class="passed_spec_name">should be able to call mock()</span></dd> <script type="text/javascript">makeRed('rspec-header');</script> - <script type="text/javascript">makeRed('behaviour_1');</script> + <script type="text/javascript">makeRed('example_group_1');</script> <script type="text/javascript">moveProgressBar('11.7');</script> <dd class="spec failed"> <span class="failed_spec_name">should fail when expected message not received</span> @@ -249,10 +249,10 @@ a { </dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_2">Running specs with --diff</dt> - <script type="text/javascript">makeRed('behaviour_2');</script> + <dt id="example_group_2">Running specs with --diff</dt> + <script type="text/javascript">makeRed('example_group_2');</script> <script type="text/javascript">moveProgressBar('35.2');</script> <dd class="spec failed"> <span class="failed_spec_name">should print diff of different strings</span> @@ -310,16 +310,16 @@ Diff: </dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_3">A consumer of a stub</dt> + <dt id="example_group_3">A consumer of a stub</dt> <script type="text/javascript">moveProgressBar('47.0');</script> <dd class="spec passed"><span class="passed_spec_name">should be able to stub methods on any Object</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_4">A stubbed method on a class</dt> + <dt id="example_group_4">A stubbed method on a class</dt> <script type="text/javascript">moveProgressBar('52.9');</script> <dd class="spec passed"><span class="passed_spec_name">should return the stubbed value</span></dd> <script type="text/javascript">moveProgressBar('58.8');</script> @@ -328,9 +328,9 @@ Diff: <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_5">A mock</dt> + <dt id="example_group_5">A mock</dt> <script type="text/javascript">moveProgressBar('70.5');</script> <dd class="spec passed"><span class="passed_spec_name">can stub!</span></dd> <script type="text/javascript">moveProgressBar('76.4');</script> @@ -339,28 +339,28 @@ Diff: <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_6">pending example (using pending method)</dt> - <script type="text/javascript">makeYellow('behaviour_6');</script> + <dt id="example_group_6">pending example (using pending method)</dt> + <script type="text/javascript">makeYellow('example_group_6');</script> <script type="text/javascript">moveProgressBar('88.2');</script> - <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: for some reason&quot;</span></dd> + <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_7">pending example (with no block)</dt> - <script type="text/javascript">makeYellow('behaviour_7');</script> + <dt id="example_group_7">pending example (with no block)</dt> + <script type="text/javascript">makeYellow('example_group_7');</script> <script type="text/javascript">moveProgressBar('94.1');</script> - <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: Not Yet Implemented&quot;</span></dd> + <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: Not Yet Implemented&quot; (PENDING: Not Yet Implemented)</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_8">pending example (with block for pending)</dt> - <script type="text/javascript">makeYellow('behaviour_8');</script> + <dt id="example_group_8">pending example (with block for pending)</dt> + <script type="text/javascript">makeYellow('example_group_8');</script> <script type="text/javascript">moveProgressBar('100.0');</script> - <dd class="spec not_implemented"><span class="not_implemented_spec_name">should have a failing block, passed to pending, reported as &quot;PENDING: for some reason&quot;</span></dd> + <dd class="spec not_implemented"><span class="not_implemented_spec_name">should have a failing block, passed to pending, reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd> </dl> </div> <script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>x seconds</strong>";</script> vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5.html @@ -73,7 +73,7 @@ function makeYellow(element_id) { font-size: 1.2em; } -.behaviour { +.example_group { margin: 0 10px 5px; background: #fff; } @@ -176,22 +176,22 @@ a { </div> <div class="results"> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_1">Mocker</dt> + <dt id="example_group_1">Mocker</dt> <script type="text/javascript">moveProgressBar('5.8');</script> <dd class="spec passed"><span class="passed_spec_name">should be able to call mock()</span></dd> <script type="text/javascript">makeRed('rspec-header');</script> - <script type="text/javascript">makeRed('behaviour_1');</script> + <script type="text/javascript">makeRed('example_group_1');</script> <script type="text/javascript">moveProgressBar('11.7');</script> <dd class="spec failed"> <span class="failed_spec_name">should fail when expected message not received</span> <div class="failure" id="failure_1"> <div class="message"><pre>Mock 'poke me' expected :poke with (any args) once, but received it 0 times</pre></div> <div class="backtrace"><pre>./failing_examples/mocking_example.rb:13: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir' -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:25: +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:21:in `chdir' +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:21:</pre></div> <pre class="ruby"><code><span class="linenum">11</span> <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should fail when expected message not received</span><span class="punct">&quot;</span> <span class="keyword">do</span> <span class="linenum">12</span> <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">poke me</span><span class="punct">&quot;)</span> <span class="offending"><span class="linenum">13</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:poke</span><span class="punct">)</span></span> @@ -205,9 +205,9 @@ a { <div class="failure" id="failure_2"> <div class="message"><pre>Mock 'one two three' received :three out of order</pre></div> <div class="backtrace"><pre>./failing_examples/mocking_example.rb:22: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir' -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:25: +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:21:in `chdir' +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:21:</pre></div> <pre class="ruby"><code><span class="linenum">20</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:three</span><span class="punct">).</span><span class="ident">ordered</span> <span class="linenum">21</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">one</span> <span class="offending"><span class="linenum">22</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">three</span></span> @@ -219,15 +219,14 @@ a { <dd class="spec failed"> <span class="failed_spec_name">should get yelled at when sending unexpected messages</span> <div class="failure" id="failure_3"> - <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div> - <div class="backtrace"><pre>./failing_examples/mocking_example.rb:28: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir' -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> - <pre class="ruby"><code><span class="linenum">26</span> <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should get yelled at when sending unexpected messages</span><span class="punct">&quot;</span> <span class="keyword">do</span> -<span class="linenum">27</span> <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">don't talk to me</span><span class="punct">&quot;)</span> -<span class="offending"><span class="linenum">28</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_not_receive</span><span class="punct">(</span><span class="symbol">:any_message_at_all</span><span class="punct">)</span></span> -<span class="linenum">29</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">any_message_at_all</span> + <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (no args) 0 times, but received it once</pre></div> + <div class="backtrace"><pre>./failing_examples/mocking_example.rb:29: +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:25: +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:21:in `chdir' +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:21:</pre></div> + <pre class="ruby"><code><span class="linenum">27</span> <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">don't talk to me</span><span class="punct">&quot;)</span> +<span class="linenum">28</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_not_receive</span><span class="punct">(</span><span class="symbol">:any_message_at_all</span><span class="punct">)</span> +<span class="offending"><span class="linenum">29</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">any_message_at_all</span></span> <span class="linenum">30</span> <span class="keyword">end</span></code></pre> </div> </dd> @@ -237,9 +236,9 @@ a { <div class="failure" id="failure_4"> <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div> <div class="backtrace"><pre>./failing_examples/mocking_example.rb:33: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir' -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:25: +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:21:in `chdir' +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:21:</pre></div> <pre class="ruby"><code><span class="linenum">31</span> <span class="linenum">32</span> <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">has a bug we need to fix</span><span class="punct">&quot;</span> <span class="keyword">do</span> <span class="offending"><span class="linenum">33</span> <span class="ident">pending</span> <span class="punct">&quot;</span><span class="string">here is the bug</span><span class="punct">&quot;</span> <span class="keyword">do</span></span> @@ -249,10 +248,10 @@ a { </dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_2">Running specs with --diff</dt> - <script type="text/javascript">makeRed('behaviour_2');</script> + <dt id="example_group_2">Running specs with --diff</dt> + <script type="text/javascript">makeRed('example_group_2');</script> <script type="text/javascript">moveProgressBar('35.2');</script> <dd class="spec failed"> <span class="failed_spec_name">should print diff of different strings</span> @@ -262,14 +261,14 @@ a { Diff: @@ -1,4 +1,4 @@ RSpec is a --behavior driven development -+behaviour driven development +-behaviour driven development ++behavior driven development framework for Ruby </pre></div> <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:13: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir' -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:25: +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:21:in `chdir' +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:21:</pre></div> <pre class="ruby"><code><span class="linenum">11</span><span class="ident">framework</span> <span class="keyword">for</span> <span class="constant">Ruby</span> <span class="linenum">12</span><span class="constant">EOF</span> <span class="offending"><span class="linenum">13</span> <span class="ident">usa</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="ident">uk</span></span> @@ -293,14 +292,14 @@ Diff: @@ -1,5 +1,5 @@ &lt;Animal name=bob, --species=giraffe -+species=tortoise +-species=tortoise ++species=giraffe &gt; </pre></div> <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:34: -./spec/spec/runner/formatter/html_formatter_spec.rb:17: -./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir' -./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div> +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:25: +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:21:in `chdir' +/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:21:</pre></div> <pre class="ruby"><code><span class="linenum">32</span> <span class="ident">expected</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">giraffe</span><span class="punct">&quot;</span> <span class="linenum">33</span> <span class="ident">actual</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">tortoise</span><span class="punct">&quot;</span> <span class="offending"><span class="linenum">34</span> <span class="ident">expected</span><span class="punct">.</span><span class="ident">should</span> <span class="ident">eql</span><span class="punct">(</span><span class="ident">actual</span><span class="punct">)</span></span> @@ -310,16 +309,16 @@ Diff: </dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_3">A consumer of a stub</dt> + <dt id="example_group_3">A consumer of a stub</dt> <script type="text/javascript">moveProgressBar('47.0');</script> <dd class="spec passed"><span class="passed_spec_name">should be able to stub methods on any Object</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_4">A stubbed method on a class</dt> + <dt id="example_group_4">A stubbed method on a class</dt> <script type="text/javascript">moveProgressBar('52.9');</script> <dd class="spec passed"><span class="passed_spec_name">should return the stubbed value</span></dd> <script type="text/javascript">moveProgressBar('58.8');</script> @@ -328,9 +327,9 @@ Diff: <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_5">A mock</dt> + <dt id="example_group_5">A mock</dt> <script type="text/javascript">moveProgressBar('70.5');</script> <dd class="spec passed"><span class="passed_spec_name">can stub!</span></dd> <script type="text/javascript">moveProgressBar('76.4');</script> @@ -339,28 +338,28 @@ Diff: <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_6">pending example (using pending method)</dt> - <script type="text/javascript">makeYellow('behaviour_6');</script> + <dt id="example_group_6">pending example (using pending method)</dt> + <script type="text/javascript">makeYellow('example_group_6');</script> <script type="text/javascript">moveProgressBar('88.2');</script> - <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: for some reason&quot;</span></dd> + <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_7">pending example (with no block)</dt> - <script type="text/javascript">makeYellow('behaviour_7');</script> + <dt id="example_group_7">pending example (with no block)</dt> + <script type="text/javascript">makeYellow('example_group_7');</script> <script type="text/javascript">moveProgressBar('94.1');</script> - <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: Not Yet Implemented&quot;</span></dd> + <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: Not Yet Implemented&quot; (PENDING: Not Yet Implemented)</span></dd> </dl> </div> -<div class="behaviour"> +<div class="example_group"> <dl> - <dt id="behaviour_8">pending example (with block for pending)</dt> - <script type="text/javascript">makeYellow('behaviour_8');</script> + <dt id="example_group_8">pending example (with block for pending)</dt> + <script type="text/javascript">makeYellow('example_group_8');</script> <script type="text/javascript">moveProgressBar('100.0');</script> - <dd class="spec not_implemented"><span class="not_implemented_spec_name">should have a failing block, passed to pending, reported as &quot;PENDING: for some reason&quot;</span></dd> + <dd class="spec not_implemented"><span class="not_implemented_spec_name">should have a failing block, passed to pending, reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd> </dl> </div> <script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>x seconds</strong>";</script> vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6.html @@ -1,57 +1,63 @@ require File.dirname(__FILE__) + '/../../../spec_helper' require 'hpricot' # Needed to compare generated with wanted HTML - -describe "HtmlFormatter" do - it_should_behave_like "Test::Unit io sink" - ['--diff', '--dry-run'].each do |opt| - it "should produce HTML identical to the one we designed manually with #{opt}" do - root = File.expand_path(File.dirname(__FILE__) + '/../../../..') - suffix = PLATFORM == 'java' ? '-jruby' : '' - expected_file = File.dirname(__FILE__) + "/html_formatted-#{VERSION}#{suffix}.html" - raise "There is no HTML file with expected content for this platform: #{expected_file}" unless File.file?(expected_file) - expected_html = File.read(expected_file) - raise "There should be no absolute paths in html_formatted.html!!" if (expected_html =~ /\/Users/n || expected_html =~ /\/home/n) - - Dir.chdir(root) do - args = ['failing_examples/mocking_example.rb', 'failing_examples/diffing_spec.rb', 'examples/stubbing_example.rb', 'examples/pending_example.rb', '--format', 'html', opt] - err = StringIO.new - out = StringIO.new - Spec::Runner::CommandLine.run( - args, - err, - out - ) - - seconds = /\d+\.\d+ seconds/ - html = out.string.gsub seconds, 'x seconds' - expected_html.gsub! seconds, 'x seconds' - - if opt == '--diff' - # Uncomment this line temporarily in order to overwrite the expected with actual. - # Use with care!!! - # File.open(expected_file, 'w') {|io| io.write(html)} - - doc = Hpricot(html) - backtraces = doc.search("div.backtrace").collect {|e| e.at("/pre").inner_html} - doc.search("div.backtrace").remove - - expected_doc = Hpricot(expected_html) - expected_backtraces = expected_doc.search("div.backtrace").collect {|e| e.at("/pre").inner_html} - expected_doc.search("div.backtrace").remove - - doc.inner_html.should == expected_doc.inner_html - - expected_backtraces.each_with_index do |expected_line, i| - expected_path, expected_line_number, expected_suffix = expected_line.split(':') - actual_path, actual_line_number, actual_suffix = backtraces[i].split(':') - File.expand_path(actual_path).should == File.expand_path(expected_path) - actual_line_number.should == expected_line_number +require 'spec/runner/formatter/html_formatter' + +module Spec + module Runner + module Formatter + describe HtmlFormatter do + ['--diff', '--dry-run'].each do |opt| + def jruby? + PLATFORM == 'java' + end + + it "should produce HTML identical to the one we designed manually with #{opt}" do + root = File.expand_path(File.dirname(__FILE__) + '/../../../..') + suffix = jruby? ? '-jruby' : '' + expected_file = File.dirname(__FILE__) + "/html_formatted-#{::VERSION}#{suffix}.html" + raise "There is no HTML file with expected content for this platform: #{expected_file}" unless File.file?(expected_file) + expected_html = File.read(expected_file) + + Dir.chdir(root) do + args = ['failing_examples/mocking_example.rb', 'failing_examples/diffing_spec.rb', 'examples/pure/stubbing_example.rb', 'examples/pure/pending_example.rb', '--format', 'html', opt] + err = StringIO.new + out = StringIO.new + CommandLine.run( + OptionParser.parse(args, err, out) + ) + + seconds = /\d+\.\d+ seconds/ + html = out.string.gsub seconds, 'x seconds' + expected_html.gsub! seconds, 'x seconds' + + if opt == '--diff' + # Uncomment this line temporarily in order to overwrite the expected with actual. + # Use with care!!! + # File.open(expected_file, 'w') {|io| io.write(html)} + + doc = Hpricot(html) + backtraces = doc.search("div.backtrace").collect {|e| e.at("/pre").inner_html} + doc.search("div.backtrace").remove + + expected_doc = Hpricot(expected_html) + expected_backtraces = expected_doc.search("div.backtrace").collect {|e| e.at("/pre").inner_html} + expected_doc.search("div.backtrace").remove + + doc.inner_html.should == expected_doc.inner_html + + expected_backtraces.each_with_index do |expected_line, i| + expected_path, expected_line_number, expected_suffix = expected_line.split(':') + actual_path, actual_line_number, actual_suffix = backtraces[i].split(':') + File.expand_path(actual_path).should == File.expand_path(expected_path) + actual_line_number.should == expected_line_number + end + else + html.should =~ /This was a dry-run/m + end + end end - else - html.should =~ /This was a dry-run/m end end end end - end vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb @@ -1,4 +1,5 @@ require File.dirname(__FILE__) + '/../../../spec_helper.rb' +require 'spec/runner/formatter/progress_bar_formatter' module Spec module Runner @@ -6,8 +7,10 @@ module Spec describe ProgressBarFormatter do before(:each) do @io = StringIO.new - @options = Options.new(StringIO.new, @io) - @formatter = @options.create_formatter(ProgressBarFormatter) + @options = mock('options') + @options.stub!(:dry_run).and_return(false) + @options.stub!(:colour).and_return(false) + @formatter = ProgressBarFormatter.new(@options, @io) end it "should produce line break on start dump" do @@ -21,7 +24,12 @@ module Spec end it "should produce standard summary" do - @formatter.example_pending("behaviour", "example", "message") + example_group = ExampleGroup.describe("example_group") do + specify "example" do + end + end + example = example_group.examples.first + @formatter.example_pending(example, "message") @io.rewind @formatter.dump_summary(3, 2, 1, 1) @io.string.should eql(%Q| @@ -33,29 +41,29 @@ Finished in 3 seconds it "should push green dot for passing spec" do @io.should_receive(:tty?).and_return(true) - @options.colour = true + @options.should_receive(:colour).and_return(true) @formatter.example_passed("spec") @io.string.should == "\e[32m.\e[0m" end it "should push red F for failure spec" do @io.should_receive(:tty?).and_return(true) - @options.colour = true + @options.should_receive(:colour).and_return(true) @formatter.example_failed("spec", 98, Reporter::Failure.new("c s", Spec::Expectations::ExpectationNotMetError.new)) @io.string.should eql("\e[31mF\e[0m") end it "should push magenta F for error spec" do @io.should_receive(:tty?).and_return(true) - @options.colour = true + @options.should_receive(:colour).and_return(true) @formatter.example_failed("spec", 98, Reporter::Failure.new("c s", RuntimeError.new)) @io.string.should eql("\e[35mF\e[0m") end it "should push blue F for fixed pending spec" do @io.should_receive(:tty?).and_return(true) - @options.colour = true - @formatter.example_failed("spec", 98, Reporter::Failure.new("c s", Spec::DSL::PendingFixedError.new)) + @options.should_receive(:colour).and_return(true) + @formatter.example_failed("spec", 98, Reporter::Failure.new("c s", Spec::Example::PendingExampleFixedError.new)) @io.string.should eql("\e[34mF\e[0m") end @@ -81,18 +89,23 @@ EOE end it "should dump pending" do - @formatter.example_pending("behaviour", "example", "message") + example_group = ExampleGroup.describe("example_group") do + specify "example" do + end + end + example = example_group.examples.first + @formatter.example_pending(example, "message") @formatter.dump_pending - @io.string.should =~ /Pending\:\nbehaviour example \(message\)\n/ + @io.string.should =~ /Pending\:\nexample_group example \(message\)\n/ end end describe "ProgressBarFormatter outputting to custom out" do before(:each) do @out = mock("out") - @options = Options.new(StringIO.new, @out) + @options = mock('options') @out.stub!(:puts) - @formatter = @options.create_formatter(ProgressBarFormatter) + @formatter = ProgressBarFormatter.new(@options, @out) @formatter.class.send :public, :output_to_tty? end @@ -105,6 +118,20 @@ EOE @formatter.output_to_tty?.should be_false end end + + describe ProgressBarFormatter, "dry run" do + before(:each) do + @io = StringIO.new + options = mock('options') + options.stub!(:dry_run).and_return(true) + @formatter = ProgressBarFormatter.new(options, @io) + end + + it "should not produce summary on dry run" do + @formatter.dump_summary(3, 2, 1, 0) + @io.string.should eql("") + end + end end end end vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_spec.rb @@ -1,11 +1,18 @@ require File.dirname(__FILE__) + '/../../../spec_helper.rb' +require 'spec/runner/formatter/snippet_extractor' -describe Spec::Runner::Formatter::SnippetExtractor do - it "should fall back on a default message when it doesn't understand a line" do - Spec::Runner::Formatter::SnippetExtractor.new.snippet_for("blech").should == ["# Couldn't get snippet for blech", 1] - end +module Spec + module Runner + module Formatter + describe SnippetExtractor do + it "should fall back on a default message when it doesn't understand a line" do + SnippetExtractor.new.snippet_for("blech").should == ["# Couldn't get snippet for blech", 1] + end - it "should fall back on a default message when it doesn't find the file" do - Spec::Runner::Formatter::SnippetExtractor.new.lines_around("blech", 8).should == "# Couldn't get snippet for blech" + it "should fall back on a default message when it doesn't find the file" do + SnippetExtractor.new.lines_around("blech", 8).should == "# Couldn't get snippet for blech" + end + end + end end -end +end \ No newline at end of file vendor/plugins/rspec/spec/spec/runner/formatter/snippet_extractor_spec.rb @@ -1,63 +1,128 @@ require File.dirname(__FILE__) + '/../../../spec_helper.rb' +require 'spec/runner/formatter/specdoc_formatter' module Spec module Runner module Formatter - describe "SpecdocFormatter" do + describe SpecdocFormatter do + it_should_behave_like "sandboxed rspec_options" + attr_reader :io, :options, :formatter, :example_group before(:each) do @io = StringIO.new - @options = Options.new(StringIO.new, @io) - @formatter = @options.create_formatter(SpecdocFormatter) - @behaviour = Class.new(::Spec::DSL::Example).describe("My Behaviour") + options.stub!(:dry_run).and_return(false) + options.stub!(:colour).and_return(false) + @formatter = SpecdocFormatter.new(options, io) + @example_group = ::Spec::Example::ExampleGroup.describe("ExampleGroup") do + specify "example" do + end + end end - it "should produce standard summary without pending when pending has a 0 count" do - @formatter.dump_summary(3, 2, 1, 0) - @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure\n") - end + describe "where ExampleGroup has no superclasss with a description" do + before do + formatter.add_example_group(example_group) + end - it "should produce standard summary" do - @formatter.dump_summary(3, 2, 1, 4) - @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure, 4 pending\n") - end + it "should produce standard summary without pending when pending has a 0 count" do + formatter.dump_summary(3, 2, 1, 0) + io.string.should have_example_group_output("\nFinished in 3 seconds\n\n2 examples, 1 failure\n") + end - it "should push context name" do - @formatter.add_behaviour(Spec::DSL::BehaviourDescription.new("context")) - @io.string.should eql("\ncontext\n") - end + it "should produce standard summary" do + formatter.dump_summary(3, 2, 1, 4) + io.string.should have_example_group_output("\nFinished in 3 seconds\n\n2 examples, 1 failure, 4 pending\n") + end - it "should push failing spec name and failure number" do - @formatter.example_failed(@behaviour.create_example_definition("spec"), 98, Reporter::Failure.new("c s", RuntimeError.new)) - @io.string.should eql("- spec (ERROR - 98)\n") - end + it "should push ExampleGroup name" do + io.string.should eql("\nExampleGroup\n") + end - it "should push nothing on start" do - @formatter.start(5) - @io.string.should eql("") - end + it "when having an error, should push failing spec name and failure number" do + formatter.example_failed( + example_group.it("spec"), + 98, + Reporter::Failure.new("c s", RuntimeError.new) + ) + io.string.should have_example_group_output("- spec (ERROR - 98)\n") + end - it "should push nothing on start dump" do - @formatter.start_dump - @io.string.should eql("") - end + it "when having an expectation failure, should push failing spec name and failure number" do + formatter.example_failed( + example_group.it("spec"), + 98, + Reporter::Failure.new("c s", Spec::Expectations::ExpectationNotMetError.new) + ) + io.string.should have_example_group_output("- spec (FAILED - 98)\n") + end - it "should push passing spec name" do - @formatter.example_passed(@behaviour.create_example_definition("spec")) - @io.string.should eql("- spec\n") - end + it "should push nothing on start" do + formatter.start(5) + io.string.should have_example_group_output("") + end - it "should push pending example name and message" do - @formatter.example_pending('behaviour', 'example','reason') - @io.string.should eql("- example (PENDING: reason)\n") - end + it "should push nothing on start dump" do + formatter.start_dump + io.string.should have_example_group_output("") + end - it "should dump pending" do - @formatter.example_pending('behaviour', 'example','reason') - @io.rewind - @formatter.dump_pending - @io.string.should =~ /Pending\:\nbehaviour example \(reason\)\n/ + it "should push passing spec name" do + formatter.example_passed(example_group.it("spec")) + io.string.should have_example_group_output("- spec\n") + end + + it "should push pending example name and message" do + formatter.example_pending(example_group.examples.first, 'reason') + io.string.should have_example_group_output("- example (PENDING: reason)\n") + end + + it "should dump pending" do + formatter.example_pending(example_group.examples.first, 'reason') + io.rewind + formatter.dump_pending + io.string.should =~ /Pending\:\nExampleGroup example \(reason\)\n/ + end + + def have_example_group_output(expected_output) + expected = "\nExampleGroup\n#{expected_output}" + ::Spec::Matchers::SimpleMatcher.new(expected) do |actual| + actual == expected + end + end end + describe "where ExampleGroup has two superclasses with a description" do + attr_reader :child_example_group, :grand_child_example_group + before do + @child_example_group = Class.new(example_group).describe("Child ExampleGroup") + @grand_child_example_group = Class.new(child_example_group).describe("GrandChild ExampleGroup") + formatter.add_example_group(grand_child_example_group) + end + + specify "when having an error, should push failing spec name and failure number" do + formatter.example_failed( + example_group.it("spec"), + 98, + Reporter::Failure.new("c s", RuntimeError.new) + ) + io.string.should have_nested_example_group_output("- spec (ERROR - 98)\n") + end + + specify "when having an expectation failure, should push failing spec name and failure number" do + formatter.example_failed( + example_group.it("spec"), + 98, + Reporter::Failure.new("c s", Spec::Expectations::ExpectationNotMetError.new) + ) + io.string.should have_nested_example_group_output("- spec (FAILED - 98)\n") + end + + def have_nested_example_group_output(expected_output) + expected_full_output = "\nExampleGroup Child ExampleGroup GrandChild ExampleGroup\n#{expected_output}" + ::Spec::Matchers::SimpleMatcher.new(expected_full_output) do |actual| + actual == expected_full_output + end + end + end end end end vendor/plugins/rspec/spec/spec/runner/formatter/specdoc_formatter_spec.rb @@ -59,4 +59,20 @@ unless [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM} heckle_runner.heckle_with end end + + describe "Heckler" do + it "should say yes to tests_pass? if specs pass" do + options = mock("options", :null_object => true) + options.should_receive(:run_examples).and_return(true) + heckler = Spec::Runner::Heckler.new("Foo", nil, options) + heckler.tests_pass?.should be_true + end + + it "should say no to tests_pass? if specs fail" do + options = mock("options", :null_object => true) + options.should_receive(:run_examples).and_return(false) + heckler = Spec::Runner::Heckler.new("Foo", nil, options) + heckler.tests_pass?.should be_false + end + end end vendor/plugins/rspec/spec/spec/runner/heckle_runner_spec.rb @@ -3,7 +3,6 @@ unless [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM} require 'spec/runner/heckle_runner' describe "Heckler" do - it_should_behave_like "Test::Unit io sink" it "should run examples on tests_pass?" do options = Spec::Runner::Options.new(StringIO.new, StringIO.new) options.should_receive(:run_examples).with().and_return(&options.method(:run_examples)) vendor/plugins/rspec/spec/spec/runner/heckler_spec.rb @@ -11,32 +11,32 @@ module Spec it "should leave anything in lib spec dir" do ["expectations", "mocks", "runner", "stubs"].each do |child| @error.set_backtrace(["/lib/spec/#{child}/anything.rb"]) - @tweaker.tweak_backtrace(@error, "spec name") + @tweaker.tweak_backtrace(@error) @error.backtrace.should_not be_empty end end it "should leave anything in spec dir" do @error.set_backtrace(["/lib/spec/expectations/anything.rb"]) - @tweaker.tweak_backtrace(@error, "spec name") + @tweaker.tweak_backtrace(@error) @error.backtrace.should_not be_empty end it "should leave bin spec" do @error.set_backtrace(["bin/spec:"]) - @tweaker.tweak_backtrace(@error, "spec name") + @tweaker.tweak_backtrace(@error) @error.backtrace.should_not be_empty end it "should not barf on nil backtrace" do lambda do - @tweaker.tweak_backtrace(@error, "spec name") + @tweaker.tweak_backtrace(@error) end.should_not raise_error end it "should clean up double slashes" do @error.set_backtrace(["/a//b/c//d.rb"]) - @tweaker.tweak_backtrace(@error, "spec name") + @tweaker.tweak_backtrace(@error) @error.backtrace.should include("/a/b/c/d.rb") end vendor/plugins/rspec/spec/spec/runner/noisy_backtrace_tweaker_spec.rb @@ -1,4 +1,5 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' +require 'fileutils' describe "OptionParser" do before(:each) do @@ -11,12 +12,17 @@ describe "OptionParser" do @parser.parse(args) @parser.options end - + + it "should accept files to include" do + options = parse(["--pattern", "foo"]) + options.filename_pattern.should == "foo" + end + it "should accept dry run option" do options = parse(["--dry-run"]) options.dry_run.should be_true end - + it "should eval and use custom formatter when none of the builtins" do options = parse(["--format", "Custom::Formatter"]) options.formatters[0].class.should be(Custom::Formatter) @@ -34,32 +40,43 @@ describe "OptionParser" do options.formatters[2].where.should eql("foo\\bar") options.formatters[3].where.should eql("/foo/bar") end - + it "should not be verbose by default" do options = parse([]) options.verbose.should be_nil end - + it "should not use colour by default" do options = parse([]) options.colour.should == false end - + + it "should print help to stdout if no args" do + pending 'A regression since 1.0.8' do + options = parse([]) + @out.rewind + @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m) + end + end + it "should print help to stdout" do options = parse(["--help"]) @out.rewind @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m) end - + it "should print instructions about how to require missing formatter" do - lambda { options = parse(["--format", "Custom::MissingFormatter"]) }.should raise_error(NameError) + lambda do + options = parse(["--format", "Custom::MissingFormatter"]) + options.formatters + end.should raise_error(NameError) @err.string.should match(/Couldn't find formatter class Custom::MissingFormatter/n) end - + it "should print version to stdout" do options = parse(["--version"]) @out.rewind - @out.read.should match(/RSpec-\d+\.\d+\.\d+.*\(r\d+\) - BDD for Ruby\nhttp:\/\/rspec.rubyforge.org\/\n/n) + @out.read.should match(/RSpec-\d+\.\d+\.\d+.*\(build \d+\) - BDD for Ruby\nhttp:\/\/rspec.rubyforge.org\/\n/n) end it "should require file when require specified" do @@ -67,37 +84,37 @@ describe "OptionParser" do parse(["--require", "whatever"]) end.should raise_error(LoadError) end - + it "should support c option" do options = parse(["-c"]) options.colour.should be_true end - + it "should support queens colour option" do options = parse(["--colour"]) options.colour.should be_true end - + it "should support us color option" do options = parse(["--color"]) options.colour.should be_true end - + it "should support single example with -e option" do options = parse(["-e", "something or other"]) options.examples.should eql(["something or other"]) end - + it "should support single example with -s option (will be removed when autotest supports -e)" do options = parse(["-s", "something or other"]) options.examples.should eql(["something or other"]) end - + it "should support single example with --example option" do options = parse(["--example", "something or other"]) options.examples.should eql(["something or other"]) end - + it "should read several example names from file if --example is given an existing file name" do options = parse(["--example", File.dirname(__FILE__) + '/examples.txt']) options.examples.should eql([ @@ -109,156 +126,153 @@ describe "OptionParser" do options = parse(["--example", File.dirname(__FILE__) + '/empty_file.txt']) options.examples.should eql([]) end - + it "should use html formatter when format is h" do options = parse(["--format", "h"]) options.formatters[0].class.should equal(Spec::Runner::Formatter::HtmlFormatter) end - + + it "should use html story formatter when format is h" do + options = parse(["--format", "h"]) + options.story_formatters[0].class.should equal(Spec::Runner::Formatter::Story::HtmlFormatter) + end + it "should use html formatter when format is html" do options = parse(["--format", "html"]) options.formatters[0].class.should equal(Spec::Runner::Formatter::HtmlFormatter) end - + + it "should use html story formatter when format is html" do + options = parse(["--format", "html"]) + options.story_formatters[0].class.should equal(Spec::Runner::Formatter::Story::HtmlFormatter) + end + it "should use html formatter with explicit output when format is html:test.html" do FileUtils.rm 'test.html' if File.exist?('test.html') options = parse(["--format", "html:test.html"]) + options.formatters # creates the file File.should be_exist('test.html') options.formatters[0].class.should equal(Spec::Runner::Formatter::HtmlFormatter) options.formatters[0].close FileUtils.rm 'test.html' end - + it "should use noisy backtrace tweaker with b option" do options = parse(["-b"]) options.backtrace_tweaker.should be_instance_of(Spec::Runner::NoisyBacktraceTweaker) end - + it "should use noisy backtrace tweaker with backtrace option" do options = parse(["--backtrace"]) options.backtrace_tweaker.should be_instance_of(Spec::Runner::NoisyBacktraceTweaker) end - + it "should use quiet backtrace tweaker by default" do options = parse([]) options.backtrace_tweaker.should be_instance_of(Spec::Runner::QuietBacktraceTweaker) end - + it "should use progress bar formatter by default" do options = parse([]) options.formatters[0].class.should equal(Spec::Runner::Formatter::ProgressBarFormatter) end - - it "should use rdoc formatter when format is r" do - options = parse(["--format", "r"]) - options.formatters[0].class.should equal(Spec::Runner::Formatter::RdocFormatter) - end - - it "should use rdoc formatter when format is rdoc" do - options = parse(["--format", "rdoc"]) - options.formatters[0].class.should equal(Spec::Runner::Formatter::RdocFormatter) - end - + it "should use specdoc formatter when format is s" do options = parse(["--format", "s"]) options.formatters[0].class.should equal(Spec::Runner::Formatter::SpecdocFormatter) end - + it "should use specdoc formatter when format is specdoc" do options = parse(["--format", "specdoc"]) options.formatters[0].class.should equal(Spec::Runner::Formatter::SpecdocFormatter) end - + it "should support diff option when format is not specified" do options = parse(["--diff"]) options.diff_format.should == :unified end - + it "should use unified diff format option when format is unified" do options = parse(["--diff", "unified"]) options.diff_format.should == :unified options.differ_class.should equal(Spec::Expectations::Differs::Default) end - + it "should use context diff format option when format is context" do options = parse(["--diff", "context"]) options.diff_format.should == :context options.differ_class.should == Spec::Expectations::Differs::Default end - + it "should use custom diff format option when format is a custom format" do Spec::Expectations.differ.should_not be_instance_of(Custom::Differ) - + options = parse(["--diff", "Custom::Differ"]) options.parse_diff "Custom::Differ" options.diff_format.should == :custom options.differ_class.should == Custom::Differ Spec::Expectations.differ.should be_instance_of(Custom::Differ) end - + it "should print instructions about how to fix missing differ" do lambda { parse(["--diff", "Custom::MissingFormatter"]) }.should raise_error(NameError) @err.string.should match(/Couldn't find differ class Custom::MissingFormatter/n) end - - it "should support --line to identify spec" do - spec_parser = mock("spec_parser") - @parser.instance_variable_set('@spec_parser', spec_parser) - - file_factory = mock("File") - file_factory.should_receive(:file?).and_return(true) - file_factory.should_receive(:open).and_return("fake_io") - @parser.instance_variable_set('@file_factory', file_factory) - - spec_parser.should_receive(:spec_name_for).with("fake_io", 169).and_return("some spec") - - options = parse(["some file", "--line", "169"]) - options.examples.should eql(["some spec"]) - File.rspec_verify - end - - it "should fail with error message if file is dir along with --line" do - spec_parser = mock("spec_parser") - @parser.instance_variable_set('@spec_parser', spec_parser) - - file_factory = mock("File") - file_factory.should_receive(:file?).and_return(false) - file_factory.should_receive(:directory?).and_return(true) - @parser.instance_variable_set('@file_factory', file_factory) - - options = parse(["some file", "--line", "169"]) - @err.string.should match(/You must specify one file, not a directory when using the --line option/n) - end - - it "should fail with error message if file is dir along with --line" do - spec_parser = mock("spec_parser") - @parser.instance_variable_set('@spec_parser', spec_parser) - - file_factory = mock("File") - file_factory.should_receive(:file?).and_return(false) - file_factory.should_receive(:directory?).and_return(false) - @parser.instance_variable_set('@file_factory', file_factory) - - options = parse(["some file", "--line", "169"]) - @err.string.should match(/some file does not exist/n) - end - - it "should fail with error message if more than one files are specified along with --line" do - spec_parser = mock("spec_parser") - @parser.instance_variable_set('@spec_parser', spec_parser) - - options = parse(["some file", "some other file", "--line", "169"]) - @err.string.should match(/Only one file can be specified when using the --line option/n) - end - - it "should fail with error message if --example and --line are used simultaneously" do - spec_parser = mock("spec_parser") - @parser.instance_variable_set('@spec_parser', spec_parser) - - options = parse(["some file", "--example", "some example", "--line", "169"]) - @err.string.should match(/You cannot use both --line and --example/n) + + describe "when attempting a focussed spec" do + attr_reader :file, :dir + before do + @original_rspec_options = $rspec_options + @file = "#{File.dirname(__FILE__)}/spec_parser/spec_parser_fixture.rb" + @dir = File.dirname(file) + end + + after do + $rspec_options = @original_rspec_options + end + + def parse(args) + options = super + $rspec_options = options + options.filename_pattern = "*_fixture.rb" + options + end + + it "should support --line to identify spec" do + options = parse([file, "--line", "13"]) + options.line_number.should == 13 + options.examples.should be_empty + options.run_examples + options.examples.should eql(["d"]) + end + + it "should fail with error message if file is dir along with --line" do + options = parse([dir, "--line", "169"]) + options.line_number.should == 169 + options.run_examples + @err.string.should match(/You must specify one file, not a directory when using the --line option/n) + end + + it "should fail with error message if file does not exist along with --line" do + options = parse(["some file", "--line", "169"]) + proc do + options.run_examples + end.should raise_error + end + + it "should fail with error message if more than one files are specified along with --line" do + options = parse([file, file, "--line", "169"]) + options.run_examples + @err.string.should match(/Only one file can be specified when using the --line option/n) + end + + it "should fail with error message if --example and --line are used simultaneously" do + options = parse([file, "--example", "some example", "--line", "169"]) + options.run_examples + @err.string.should match(/You cannot use both --line and --example/n) + end end - + if [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM} it "should barf when --heckle is specified (and platform is windows)" do lambda do @@ -271,18 +285,24 @@ describe "OptionParser" do options.heckle_runner.should be_instance_of(Spec::Runner::HeckleRunner) end end - + it "should read options from file when --options is specified" do options = parse(["--options", File.dirname(__FILE__) + "/spec.opts"]) options.diff_format.should_not be_nil options.colour.should be_true end - + it "should default the formatter to ProgressBarFormatter when using options file" do options = parse(["--options", File.dirname(__FILE__) + "/spec.opts"]) options.formatters.first.should be_instance_of(::Spec::Runner::Formatter::ProgressBarFormatter) end + it "should run parse drb after parsing options" do + @parser.stub!(:parse_drb) + @parser.should_receive(:parse_drb).with(["--drb"]).and_return(true) + options = parse(["--options", File.dirname(__FILE__) + "/spec_drb.opts"]) + end + it "should read spaced and multi-line options from file when --options is specified" do options = parse(["--options", File.dirname(__FILE__) + "/spec_spaced.opts"]) options.diff_format.should_not be_nil @@ -296,56 +316,69 @@ describe "OptionParser" do IO.read('test.spec.opts').should == "--colour\n--diff\n" FileUtils.rm 'test.spec.opts' end - + it "should save config to file when -G is specified" do FileUtils.rm 'test.spec.opts' if File.exist?('test.spec.opts') options = parse(["--colour", "-G", "test.spec.opts", "--diff"]) IO.read('test.spec.opts').should == "--colour\n--diff\n" FileUtils.rm 'test.spec.opts' end - - it "should call DrbCommandLine when --drb is specified" do - Spec::Runner::DrbCommandLine.should_receive(:run).with(["some/spec.rb", "--diff", "--colour"], @err, @out) - options = parse(["some/spec.rb", "--diff", "--drb", "--colour"]) + + it "when --drb is specified, calls DrbCommandLine all of the other ARGV arguments" do + options = Spec::Runner::OptionParser.parse([ + "some/spec.rb", "--diff", "--colour" + ], @err, @out) + Spec::Runner::DrbCommandLine.should_receive(:run).and_return do |options| + options.argv.should == ["some/spec.rb", "--diff", "--colour"] + end + parse(["some/spec.rb", "--diff", "--drb", "--colour"]) end it "should reverse spec order when --reverse is specified" do options = parse(["some/spec.rb", "--reverse"]) end - + it "should set an mtime comparator when --loadby mtime" do options = parse(["--loadby", 'mtime']) + runner = Spec::Runner::ExampleGroupRunner.new(options) + Spec::Runner::ExampleGroupRunner.should_receive(:new). + with(options). + and_return(runner) + runner.should_receive(:load_files).with(["most_recent_spec.rb", "command_line_spec.rb"]) + Dir.chdir(File.dirname(__FILE__)) do options.files << 'command_line_spec.rb' options.files << 'most_recent_spec.rb' FileUtils.touch "most_recent_spec.rb" - options.paths.should == ["most_recent_spec.rb", "command_line_spec.rb"] + options.run_examples FileUtils.rm "most_recent_spec.rb" end end - + it "should use the standard runner by default" do + runner = ::Spec::Runner::ExampleGroupRunner.new(@parser.options) + ::Spec::Runner::ExampleGroupRunner.should_receive(:new). + with(@parser.options). + and_return(runner) options = parse([]) - options.custom_runner.should be_nil + options.run_examples end - + it "should use a custom runner when given" do - options = parse(["--runner", "Custom::BehaviourRunner"]) - options.custom_runner.class.should equal(Custom::BehaviourRunner) + runner = Custom::ExampleGroupRunner.new(@parser.options, nil) + Custom::ExampleGroupRunner.should_receive(:new). + with(@parser.options, nil). + and_return(runner) + options = parse(["--runner", "Custom::ExampleGroupRunner"]) + options.run_examples end - + it "should use a custom runner with extra options" do - options = parse(["--runner", "Custom::BehaviourRunner:something"]) - options.custom_runner.class.should equal(Custom::BehaviourRunner) - end - - it "should not have a custom runner by default" do - options = Spec::Runner::OptionParser.parse([], @err, @out) - options.custom_runner.should be_nil + runner = Custom::ExampleGroupRunner.new(@parser.options, 'something') + Custom::ExampleGroupRunner.should_receive(:new). + with(@parser.options, 'something'). + and_return(runner) + options = parse(["--runner", "Custom::ExampleGroupRunner:something"]) + options.run_examples end - - it "should return the correct default behaviour runner" do - options = Spec::Runner::OptionParser.parse(["--runner", "Custom::BehaviourRunner"], @err, @out) - options.custom_runner.class.should equal(Custom::BehaviourRunner) - end end vendor/plugins/rspec/spec/spec/runner/option_parser_spec.rb @@ -8,233 +8,396 @@ module Spec @out = StringIO.new('') @options = Options.new(@err, @out) end - + after(:each) do Spec::Expectations.differ = nil end - it "instantiates empty arrays" do - @options.examples.should == [] - @options.formatters.should == [] + describe "#examples" do + it "should default to empty array" do + @options.examples.should == [] + end end - - it "defaults to QuietBacktraceTweaker" do - @options.backtrace_tweaker.class.should == QuietBacktraceTweaker + + describe "#include_pattern" do + it "should default to '**/*_spec.rb'" do + @options.filename_pattern.should == "**/*_spec.rb" + end end + + describe "#files_to_load" do + + it "should load files not following pattern if named explicitly" do + file = File.expand_path(File.dirname(__FILE__) + "/resources/a_bar.rb") + @options.files << file + @options.files_to_load.should include(file) + end + + describe "with default --pattern" do + it "should load files named _spec.rb" do + dir = File.expand_path(File.dirname(__FILE__) + "/resources/") + @options.files << dir + @options.files_to_load.should == ["#{dir}/a_spec.rb"] + end + end + + describe "with explicit pattern (single)" do + before(:each) do + @options.filename_pattern = "**/*_foo.rb" + end + + it "should load files following pattern" do + file = File.expand_path(File.dirname(__FILE__) + "/resources/a_foo.rb") + @options.files << file + @options.files_to_load.should include(file) + end + + it "should load files in directories following pattern" do + dir = File.expand_path(File.dirname(__FILE__) + "/resources") + @options.files << dir + @options.files_to_load.should include("#{dir}/a_foo.rb") + end + + it "should not load files in directories not following pattern" do + dir = File.expand_path(File.dirname(__FILE__) + "/resources") + @options.files << dir + @options.files_to_load.should_not include("#{dir}/a_bar.rb") + end + end + + describe "with explicit pattern (comma,separated,values)" do + + before(:each) do + @options.filename_pattern = "**/*_foo.rb,**/*_bar.rb" + end - it "defaults to no dry_run" do - @options.dry_run.should == false + it "should support comma separated values" do + dir = File.expand_path(File.dirname(__FILE__) + "/resources") + @options.files << dir + @options.files_to_load.should include("#{dir}/a_foo.rb") + @options.files_to_load.should include("#{dir}/a_bar.rb") + end + + it "should support comma separated values with spaces" do + dir = File.expand_path(File.dirname(__FILE__) + "/resources") + @options.files << dir + @options.files_to_load.should include("#{dir}/a_foo.rb") + @options.files_to_load.should include("#{dir}/a_bar.rb") + end + + end + end - it "parse_diff sets context_lines" do - @options.parse_diff nil - @options.context_lines.should == 3 + describe "#backtrace_tweaker" do + it "should default to QuietBacktraceTweaker" do + @options.backtrace_tweaker.class.should == QuietBacktraceTweaker + end end - it "defaults diff to unified" do - @options.parse_diff nil - @options.diff_format.should == :unified + describe "#dry_run" do + it "should default to false" do + @options.dry_run.should == false + end end - it "should use unified diff format option when format is unified" do - @options.parse_diff 'unified' - @options.diff_format.should == :unified - @options.differ_class.should equal(Spec::Expectations::Differs::Default) + describe "#context_lines" do + it "should default to 3" do + @options.context_lines.should == 3 + end end - it "should use context diff format option when format is context" do - @options.parse_diff 'context' - @options.diff_format.should == :context - @options.differ_class.should == Spec::Expectations::Differs::Default - end + describe "#parse_diff with nil" do + before(:each) do + @options.parse_diff nil + end - it "should use custom diff format option when format is a custom format" do - Spec::Expectations.differ.should_not be_instance_of(Custom::Differ) - - @options.parse_diff "Custom::Differ" - @options.diff_format.should == :custom - @options.differ_class.should == Custom::Differ - Spec::Expectations.differ.should be_instance_of(Custom::Differ) - end - - it "should print instructions about how to fix missing differ" do - lambda { @options.parse_diff "Custom::MissingDiffer" }.should raise_error(NameError) - @err.string.should match(/Couldn't find differ class Custom::MissingDiffer/n) - end - - it "should print instructions about how to fix bad formatter" do - lambda do - @options.parse_format "Custom::BadFormatter" - end.should raise_error(NameError, /undefined local variable or method `bad_method'/) - end - - it "parse_example sets single example when argument not a file" do - example = "something or other" - File.file?(example).should == false - @options.parse_example example - @options.examples.should eql(["something or other"]) - end - - it "parse_example sets examples to contents of file" do - example = "#{File.dirname(__FILE__)}/examples.txt" - File.should_receive(:file?).with(example).and_return(true) - file = StringIO.new("Sir, if you were my husband, I would poison your drink.\nMadam, if you were my wife, I would drink it.") - File.should_receive(:open).with(example).and_return(file) - - @options.parse_example example - @options.examples.should eql([ - "Sir, if you were my husband, I would poison your drink.", - "Madam, if you were my wife, I would drink it." - ]) - end - end + it "should make diff_format unified" do + @options.diff_format.should == :unified + end - describe Options, "#custom_runner?" do - before do - @err = StringIO.new('') - @out = StringIO.new('') - @options = Options.new(@err, @out) - end - - it "returns true when there is a runner_arg" do - @options.runner_arg = "Custom::BehaviourRunner" - @options.custom_runner?.should be_true + it "should set Spec::Expectations.differ to be a default differ" do + Spec::Expectations.differ.class.should == + ::Spec::Expectations::Differs::Default + end end - it "returns false when there is no runner_arg" do - @options.runner_arg = nil - @options.custom_runner?.should be_false - end - end + describe "#parse_diff with 'unified'" do + before(:each) do + @options.parse_diff 'unified' + end - describe Options, "splitting class names and args" do - before do - @err = StringIO.new('') - @out = StringIO.new('') - @options = Options.new(@err, @out) - end - - it "should split class names with args" do - @options.split_at_colon('Foo').should == ['Foo', nil] - @options.split_at_colon('Foo:arg').should == ['Foo', 'arg'] - @options.split_at_colon('Foo::Bar::Zap:arg').should == ['Foo::Bar::Zap', 'arg'] - @options.split_at_colon('Foo:arg1,arg2').should == ['Foo', 'arg1,arg2'] - @options.split_at_colon('Foo::Bar::Zap:arg1,arg2').should == ['Foo::Bar::Zap', 'arg1,arg2'] - @options.split_at_colon('Foo::Bar::Zap:drb://foo,drb://bar').should == ['Foo::Bar::Zap', 'drb://foo,drb://bar'] - end + it "should make diff_format unified and uses default differ_class" do + @options.diff_format.should == :unified + @options.differ_class.should equal(Spec::Expectations::Differs::Default) + end - it "should raise error when splitting something starting with a number" do - lambda { @options.split_at_colon('') }.should raise_error("Couldn't parse \"\"") + it "should set Spec::Expectations.differ to be a default differ" do + Spec::Expectations.differ.class.should == + ::Spec::Expectations::Differs::Default + end end - it "should raise error when not class name" do - lambda do - @options.load_class('foo', 'fruit', '--food') - end.should raise_error('"foo" is not a valid class name') + describe "#parse_diff with 'context'" do + before(:each) do + @options.parse_diff 'context' + end + + it "should make diff_format context and uses default differ_class" do + @options.diff_format.should == :context + @options.differ_class.should == Spec::Expectations::Differs::Default + end + + it "should set Spec::Expectations.differ to be a default differ" do + Spec::Expectations.differ.class.should == + ::Spec::Expectations::Differs::Default + end end - end - describe Options, "#differ_class and #differ_class=" do - before do - @err = StringIO.new - @out = StringIO.new - @options = Options.new(@err, @out) + describe "#parse_diff with Custom::Differ" do + before(:each) do + @options.parse_diff 'Custom::Differ' + end + + it "should use custom differ_class" do + @options.diff_format.should == :custom + @options.differ_class.should == Custom::Differ + Spec::Expectations.differ.should be_instance_of(Custom::Differ) + end + + it "should set Spec::Expectations.differ to be a default differ" do + Spec::Expectations.differ.class.should == + ::Custom::Differ + end end - it "does not set Expectations differ when differ_class is not set" do - Spec::Expectations.should_not_receive(:differ=) - @options.differ_class = nil + describe "#parse_diff with missing class name" do + it "should raise error" do + lambda { @options.parse_diff "Custom::MissingDiffer" }.should raise_error(NameError) + @err.string.should match(/Couldn't find differ class Custom::MissingDiffer/n) + end end - it "sets Expectations differ when differ_class is set" do - Spec::Expectations.should_receive(:differ=).with(anything()).and_return do |arg| - arg.class.should == Spec::Expectations::Differs::Default + describe "#parse_example" do + it "with argument thats not a file path, sets argument as the example" do + example = "something or other" + File.file?(example).should == false + @options.parse_example example + @options.examples.should eql(["something or other"]) + end + + it "with argument that is a file path, sets examples to contents of the file" do + example = "#{File.dirname(__FILE__)}/examples.txt" + File.should_receive(:file?).with(example).and_return(true) + file = StringIO.new("Sir, if you were my husband, I would poison your drink.\nMadam, if you were my wife, I would drink it.") + File.should_receive(:open).with(example).and_return(file) + + @options.parse_example example + @options.examples.should eql([ + "Sir, if you were my husband, I would poison your drink.", + "Madam, if you were my wife, I would drink it." + ]) end - @options.differ_class = Spec::Expectations::Differs::Default end - end - describe Options, "#reporter" do - before do - @err = StringIO.new - @out = StringIO.new - @options = Options.new(@err, @out) + describe "#examples_should_not_be_run" do + it "should cause #run_examples to return true and do nothing" do + @options.examples_should_not_be_run + ExampleGroupRunner.should_not_receive(:new) + + @options.run_examples.should be_true + end end - it "returns a Reporter" do - @options.reporter.should be_instance_of(Reporter) - @options.reporter.options.should === @options + describe "#load_class" do + it "should raise error when not class name" do + lambda do + @options.send(:load_class, 'foo', 'fruit', '--food') + end.should raise_error('"foo" is not a valid class name') + end end - end - describe Options, "#add_behaviour affecting passed in behaviour" do - it_should_behave_like "Test::Unit io sink" - before do - @err = StringIO.new('') - @out = StringIO.new('') - @options = Options.new(@err, @out) + describe "#reporter" do + it "returns a Reporter" do + @options.reporter.should be_instance_of(Reporter) + @options.reporter.options.should === @options + end end - it "runs all examples when options.examples is nil" do - example_1_has_run = false - example_2_has_run = false - @behaviour = Class.new(::Spec::DSL::Example).describe("A Behaviour") do - it "runs 1" do - example_1_has_run = true - end - it "runs 2" do - example_2_has_run = true + describe "#add_example_group affecting passed in example_group" do + it "runs all examples when options.examples is nil" do + example_1_has_run = false + example_2_has_run = false + @example_group = Class.new(::Spec::Example::ExampleGroup).describe("Some Examples") do + it "runs 1" do + example_1_has_run = true + end + it "runs 2" do + example_2_has_run = true + end end + + @options.examples = nil + + @options.add_example_group @example_group + @options.run_examples + example_1_has_run.should be_true + example_2_has_run.should be_true end - @options.examples = nil + it "keeps all example_definitions when options.examples is empty" do + example_1_has_run = false + example_2_has_run = false + @example_group = Class.new(::Spec::Example::ExampleGroup).describe("Some Examples") do + it "runs 1" do + example_1_has_run = true + end + it "runs 2" do + example_2_has_run = true + end + end - @options.add_behaviour @behaviour - @options.run_examples - example_1_has_run.should be_true - example_2_has_run.should be_true + @options.examples = [] + + @options.add_example_group @example_group + @options.run_examples + example_1_has_run.should be_true + example_2_has_run.should be_true + end end - it "keeps all example_definitions when options.examples is empty" do - example_1_has_run = false - example_2_has_run = false - @behaviour = Class.new(::Spec::DSL::Example).describe("A Behaviour") do - it "runs 1" do - example_1_has_run = true - end - it "runs 2" do - example_2_has_run = true + describe "#add_example_group affecting example_group" do + it "adds example_group when example_group has example_definitions and is not shared" do + @example_group = Class.new(::Spec::Example::ExampleGroup).describe("Some Examples") do + it "uses this example_group" do + end end + + @options.number_of_examples.should == 0 + @options.add_example_group @example_group + @options.number_of_examples.should == 1 + @options.example_groups.length.should == 1 end + end - @options.examples = [] + describe "#remove_example_group" do + it "should remove the ExampleGroup from the list of ExampleGroups" do + @example_group = Class.new(::Spec::Example::ExampleGroup).describe("Some Examples") do + end + @options.add_example_group @example_group + @options.example_groups.should include(@example_group) - @options.add_behaviour @behaviour - @options.run_examples - example_1_has_run.should be_true - example_2_has_run.should be_true + @options.remove_example_group @example_group + @options.example_groups.should_not include(@example_group) + end end - end - describe Options, "#add_behaviour affecting behaviours" do - it_should_behave_like "Test::Unit io sink" - before do - @err = StringIO.new('') - @out = StringIO.new('') - @options = Options.new(@err,@out) - end + describe "#run_examples" do + it "should use the standard runner by default" do + runner = ::Spec::Runner::ExampleGroupRunner.new(@options) + ::Spec::Runner::ExampleGroupRunner.should_receive(:new). + with(@options). + and_return(runner) + @options.user_input_for_runner = nil - it "adds behaviour when behaviour has example_definitions and is not shared" do - @behaviour = Class.new(::Spec::DSL::Example).describe("A Behaviour") do - it "uses this behaviour" do + @options.run_examples + end + + it "should use a custom runner when given" do + runner = Custom::ExampleGroupRunner.new(@options, nil) + Custom::ExampleGroupRunner.should_receive(:new). + with(@options, nil). + and_return(runner) + @options.user_input_for_runner = "Custom::ExampleGroupRunner" + + @options.run_examples + end + + it "should use a custom runner with extra options" do + runner = Custom::ExampleGroupRunner.new(@options, 'something') + Custom::ExampleGroupRunner.should_receive(:new). + with(@options, 'something'). + and_return(runner) + @options.user_input_for_runner = "Custom::ExampleGroupRunner:something" + + @options.run_examples + end + + describe "when there are examples" do + before(:each) do + @options.add_example_group Class.new(::Spec::Example::ExampleGroup) + @options.formatters << Formatter::BaseTextFormatter.new(@options, @out) + end + + it "runs the Examples and outputs the result" do + @options.run_examples + @out.string.should include("0 examples, 0 failures") + end + + it "sets #examples_run? to true" do + @options.examples_run?.should be_false + @options.run_examples + @options.examples_run?.should be_true + end + + describe "when using heckle runner" do + before(:each) do + @heckle_runner_mock = mock("HeckleRunner") + @options.heckle_runner = @heckle_runner_mock + end + + it "should heckle" do + @heckle_runner_mock.should_receive(:heckle_with) + @options.run_examples + end + + it "shouldn't heckle recursively" do + heckled = false + @heckle_runner_mock.should_receive(:heckle_with) { + heckled.should == false + heckled = true + @options.run_examples + } + @options.run_examples + end + + it "shouldn't load spec files twice" do + example_runner = mock("ExampleGroupRunner") + example_runner_inside_heckle = mock("ExampleGroupRunner inside Heckle") + + ExampleGroupRunner.should_receive(:new).twice.and_return( + example_runner, example_runner_inside_heckle + ) + + example_runner.stub!(:run) + example_runner.should_receive(:load_files) + @heckle_runner_mock.stub!(:heckle_with).and_return { @options.run_examples } + example_runner_inside_heckle.stub!(:run) + example_runner_inside_heckle.should_not_receive(:load_files) + + @options.run_examples + end end end - @options.number_of_examples.should == 0 - @options.add_behaviour @behaviour - @options.number_of_examples.should == 1 - @options.behaviours.length.should == 1 + describe "when there are no examples" do + before(:each) do + @options.formatters << Formatter::BaseTextFormatter.new(@options, @out) + end + + it "does not run Examples and does not output a result" do + @options.run_examples + @out.string.should_not include("examples") + @out.string.should_not include("failures") + end + + it "sets #examples_run? to false" do + @options.examples_run?.should be_false + @options.run_examples + @options.examples_run?.should be_false + end + end end - end + end end end vendor/plugins/rspec/spec/spec/runner/options_spec.rb @@ -10,13 +10,13 @@ module Spec it "should not barf on nil backtrace" do lambda do - @tweaker.tweak_backtrace(@error, "spec name") + @tweaker.tweak_backtrace(@error) end.should_not raise_error end it "should remove anything from textmate ruby bundle" do @error.set_backtrace(["/Applications/TextMate.app/Contents/SharedSupport/Bundles/Ruby.tmbundle/Support/tmruby.rb:147"]) - @tweaker.tweak_backtrace(@error, "spec name") + @tweaker.tweak_backtrace(@error) @error.backtrace.should be_empty end @@ -24,7 +24,7 @@ module Spec ["expectations", "mocks", "runner"].each do |child| element="/lib/spec/#{child}/anything.rb" @error.set_backtrace([element]) - @tweaker.tweak_backtrace(@error, "spec name") + @tweaker.tweak_backtrace(@error) unless (@error.backtrace.empty?) raise("Should have tweaked away '#{element}'") end @@ -34,7 +34,7 @@ module Spec it "should remove mock_frameworks/rspec" do element = "mock_frameworks/rspec" @error.set_backtrace([element]) - @tweaker.tweak_backtrace(@error, "spec name") + @tweaker.tweak_backtrace(@error) unless (@error.backtrace.empty?) raise("Should have tweaked away '#{element}'") end @@ -42,13 +42,13 @@ module Spec it "should remove bin spec" do @error.set_backtrace(["bin/spec:"]) - @tweaker.tweak_backtrace(@error, "spec name") + @tweaker.tweak_backtrace(@error) @error.backtrace.should be_empty end it "should clean up double slashes" do @error.set_backtrace(["/a//b/c//d.rb"]) - @tweaker.tweak_backtrace(@error, "spec name") + @tweaker.tweak_backtrace(@error) @error.backtrace.should include("/a/b/c/d.rb") end end vendor/plugins/rspec/spec/spec/runner/quiet_backtrace_tweaker_spec.rb @@ -2,214 +2,190 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' module Spec module Runner - - module ReporterSpecHelper - def setup - @io = StringIO.new - @options = Options.new(StringIO.new, @io) + describe Reporter do + attr_reader :formatter_output, :options, :backtrace_tweaker, :formatter, :reporter, :example_group + before(:each) do + @formatter_output = StringIO.new + @options = Options.new(StringIO.new, StringIO.new) @backtrace_tweaker = stub("backtrace tweaker", :tweak_backtrace => nil) - @options.backtrace_tweaker = @backtrace_tweaker - @formatter = mock("formatter") - @options.formatters << @formatter - @reporter = Reporter.new(@options) + options.backtrace_tweaker = backtrace_tweaker + @formatter = ::Spec::Runner::Formatter::BaseTextFormatter.new(options, formatter_output) + options.formatters << formatter + @reporter = Reporter.new(options) + @example_group = create_example_group("example_group") + reporter.add_example_group example_group end def failure Mocks::DuckTypeArgConstraint.new(:header, :exception) end - - def description(s) - Spec::DSL::BehaviourDescription.new(s) + + def create_example_group(description_text) + example_group = Spec::Example::ExampleGroup.describe(description_text) do + it "should do something" do + end + end + example_group end - end - - describe Reporter do - include ReporterSpecHelper - before(:each) {setup} - - it "should tell formatter when behaviour is added" do - @formatter.should_receive(:add_behaviour).with(description("behaviour")) - @reporter.add_behaviour(description("behaviour")) + + it "should assign itself as the reporter to options" do + options.reporter.should equal(@reporter) + end + + it "should tell formatter when example_group is added" do + formatter.should_receive(:add_example_group).with(example_group) + reporter.add_example_group(example_group) end - it "should handle multiple behaviours with same name" do - @formatter.should_receive(:add_behaviour).exactly(3).times - @formatter.should_receive(:example_started).exactly(3).times - @formatter.should_receive(:example_passed).exactly(3).times - @formatter.should_receive(:start_dump) - @formatter.should_receive(:dump_pending) - @formatter.should_receive(:close).with(no_args) - @formatter.should_receive(:dump_summary).with(anything(), 3, 0, 0) - @reporter.add_behaviour(description("behaviour")) - @reporter.example_started("spec 1") - @reporter.example_finished("spec 1") - @reporter.add_behaviour(description("behaviour")) - @reporter.example_started("spec 2") - @reporter.example_finished("spec 2") - @reporter.add_behaviour(description("behaviour")) - @reporter.example_started("spec 3") - @reporter.example_finished("spec 3") - @reporter.dump + it "should handle multiple example_groups with same name" do + formatter.should_receive(:add_example_group).exactly(3).times + formatter.should_receive(:example_started).exactly(3).times + formatter.should_receive(:example_passed).exactly(3).times + formatter.should_receive(:start_dump) + formatter.should_receive(:dump_pending) + formatter.should_receive(:close).with(no_args) + formatter.should_receive(:dump_summary).with(anything(), 3, 0, 0) + reporter.add_example_group(create_example_group("example_group")) + reporter.example_started("spec 1") + reporter.example_finished("spec 1") + reporter.add_example_group(create_example_group("example_group")) + reporter.example_started("spec 2") + reporter.example_finished("spec 2") + reporter.add_example_group(create_example_group("example_group")) + reporter.example_started("spec 3") + reporter.example_finished("spec 3") + reporter.dump end it "should handle multiple examples with the same name" do error=RuntimeError.new - @formatter.should_receive(:add_behaviour).exactly(2).times - @formatter.should_receive(:example_passed).with("example").exactly(2).times - @formatter.should_receive(:example_failed).with("example", 1, failure) - @formatter.should_receive(:example_failed).with("example", 2, failure) - @formatter.should_receive(:dump_failure).exactly(2).times - @formatter.should_receive(:start_dump) - @formatter.should_receive(:dump_pending) - @formatter.should_receive(:close).with(no_args) - @formatter.should_receive(:dump_summary).with(anything(), 4, 2, 0) - @backtrace_tweaker.should_receive(:tweak_backtrace).twice - @reporter.add_behaviour(description("behaviour")) - @reporter.example_finished("example") - @reporter.example_finished("example", error) - @reporter.add_behaviour(description("behaviour")) - @reporter.example_finished("example") - @reporter.example_finished("example", error) - @reporter.dump + passing = ExampleGroup.new("example") + failing = ExampleGroup.new("example") + + formatter.should_receive(:add_example_group).exactly(2).times + formatter.should_receive(:example_passed).with(passing).exactly(2).times + formatter.should_receive(:example_failed).with(failing, 1, failure) + formatter.should_receive(:example_failed).with(failing, 2, failure) + formatter.should_receive(:dump_failure).exactly(2).times + formatter.should_receive(:start_dump) + formatter.should_receive(:dump_pending) + formatter.should_receive(:close).with(no_args) + formatter.should_receive(:dump_summary).with(anything(), 4, 2, 0) + backtrace_tweaker.should_receive(:tweak_backtrace).twice + + reporter.add_example_group(create_example_group("example_group")) + reporter.example_finished(passing) + reporter.example_finished(failing, error) + + reporter.add_example_group(create_example_group("example_group")) + reporter.example_finished(passing) + reporter.example_finished(failing, error) + reporter.dump end it "should push stats to formatter even with no data" do - @formatter.should_receive(:start_dump) - @formatter.should_receive(:dump_pending) - @formatter.should_receive(:dump_summary).with(anything(), 0, 0, 0) - @formatter.should_receive(:close).with(no_args) - @reporter.dump + formatter.should_receive(:start_dump) + formatter.should_receive(:dump_pending) + formatter.should_receive(:dump_summary).with(anything(), 0, 0, 0) + formatter.should_receive(:close).with(no_args) + reporter.dump end - + it "should push time to formatter" do - @formatter.should_receive(:start).with(5) - @formatter.should_receive(:start_dump) - @formatter.should_receive(:dump_pending) - @formatter.should_receive(:close).with(no_args) - @formatter.should_receive(:dump_summary) do |time, a, b| + formatter.should_receive(:start).with(5) + formatter.should_receive(:start_dump) + formatter.should_receive(:dump_pending) + formatter.should_receive(:close).with(no_args) + formatter.should_receive(:dump_summary) do |time, a, b| time.to_s.should match(/[0-9].[0-9|e|-]+/) end - @reporter.start(5) - @reporter.end - @reporter.dump - end - end - - describe Reporter, "reporting one passing example" do - include ReporterSpecHelper - before(:each) {setup} - - it "should tell formatter example passed" do - @formatter.should_receive(:example_passed) - @reporter.example_finished("example") - end - - it "should not delegate to backtrace tweaker" do - @formatter.should_receive(:example_passed) - @backtrace_tweaker.should_not_receive(:tweak_backtrace) - @reporter.example_finished("example") + reporter.start(5) + reporter.end + reporter.dump end - it "should account for passing example in stats" do - @formatter.should_receive(:example_passed) - @formatter.should_receive(:start_dump) - @formatter.should_receive(:dump_pending) - @formatter.should_receive(:dump_summary).with(anything(), 1, 0, 0) - @formatter.should_receive(:close).with(no_args) - @reporter.example_finished("example") - @reporter.dump - end - end + describe Reporter, "reporting one passing example" do + it "should tell formatter example passed" do + formatter.should_receive(:example_passed) + reporter.example_finished("example") + end - describe Reporter, "reporting one failing example" do - include ReporterSpecHelper - before(:each) {setup} + it "should not delegate to backtrace tweaker" do + formatter.should_receive(:example_passed) + backtrace_tweaker.should_not_receive(:tweak_backtrace) + reporter.example_finished("example") + end - it "should tell formatter that example failed" do - @formatter.should_receive(:example_failed) - @reporter.example_finished("example", RuntimeError.new) - end - - it "should delegate to backtrace tweaker" do - @formatter.should_receive(:example_failed) - @backtrace_tweaker.should_receive(:tweak_backtrace) - @reporter.example_finished("spec", RuntimeError.new) + it "should account for passing example in stats" do + formatter.should_receive(:example_passed) + formatter.should_receive(:start_dump) + formatter.should_receive(:dump_pending) + formatter.should_receive(:dump_summary).with(anything(), 1, 0, 0) + formatter.should_receive(:close).with(no_args) + reporter.example_finished("example") + reporter.dump + end end - it "should account for failing example in stats" do - @formatter.should_receive(:add_behaviour) - @formatter.should_receive(:example_failed).with("example", 1, failure) - @formatter.should_receive(:start_dump) - @formatter.should_receive(:dump_pending) - @formatter.should_receive(:dump_failure).with(1, anything()) - @formatter.should_receive(:dump_summary).with(anything(), 1, 1, 0) - @formatter.should_receive(:close).with(no_args) - @reporter.add_behaviour(description("behaviour")) - @reporter.example_finished("example", RuntimeError.new) - @reporter.dump - end - - end - - describe Reporter, "reporting one pending example (Not Yet Implemented)" do - include ReporterSpecHelper - before(:each) {setup} - - it "should tell formatter example is pending" do - @formatter.should_receive(:example_pending).with(description("behaviour"), "example", "Not Yet Implemented") - @formatter.should_receive(:add_behaviour).with(description("behaviour")) - @reporter.add_behaviour(description('behaviour')) - @reporter.example_finished("example", nil, nil, true) - end + describe Reporter, "reporting one failing example" do + it "should tell formatter that example failed" do + example = example_group.it("should do something") {} + formatter.should_receive(:example_failed) + reporter.example_finished(example, RuntimeError.new) + end - it "should account for pending example in stats" do - @formatter.should_receive(:example_pending).with(description("behaviour"), "example", "Not Yet Implemented") - @formatter.should_receive(:start_dump) - @formatter.should_receive(:dump_pending) - @formatter.should_receive(:dump_summary).with(anything(), 1, 0, 1) - @formatter.should_receive(:add_behaviour).with(description("behaviour")) - @formatter.should_receive(:close).with(no_args) - @reporter.add_behaviour(description('behaviour')) - @reporter.example_finished("example", nil, nil, true) - @reporter.dump - end - end + it "should delegate to backtrace tweaker" do + formatter.should_receive(:example_failed) + backtrace_tweaker.should_receive(:tweak_backtrace) + reporter.example_finished(ExampleGroup.new("example"), RuntimeError.new) + end - describe Reporter, "reporting one pending example (ExamplePendingError)" do - include ReporterSpecHelper - before(:each) {setup} + it "should account for failing example in stats" do + example = ExampleGroup.new("example") + formatter.should_receive(:example_failed).with(example, 1, failure) + formatter.should_receive(:start_dump) + formatter.should_receive(:dump_pending) + formatter.should_receive(:dump_failure).with(1, anything()) + formatter.should_receive(:dump_summary).with(anything(), 1, 1, 0) + formatter.should_receive(:close).with(no_args) + reporter.example_finished(example, RuntimeError.new) + reporter.dump + end - it "should tell formatter example is pending" do - @formatter.should_receive(:example_pending).with(description("behaviour"), "example", "reason") - @formatter.should_receive(:add_behaviour).with(description("behaviour")) - @reporter.add_behaviour(description('behaviour')) - @reporter.example_finished("example", Spec::DSL::ExamplePendingError.new("reason"), nil, false) end - it "should account for pending example in stats" do - @formatter.should_receive(:example_pending).with(description("behaviour"), "example", "reason") - @formatter.should_receive(:start_dump) - @formatter.should_receive(:dump_pending) - @formatter.should_receive(:dump_summary).with(anything(), 1, 0, 1) - @formatter.should_receive(:close).with(no_args) - @formatter.should_receive(:add_behaviour).with(description("behaviour")) - @reporter.add_behaviour(description('behaviour')) - @reporter.example_finished("example", Spec::DSL::ExamplePendingError.new("reason"), nil, false) - @reporter.dump - end - end + describe Reporter, "reporting one pending example (ExamplePendingError)" do + it "should tell formatter example is pending" do + example = ExampleGroup.new("example") + formatter.should_receive(:example_pending).with(example, "reason") + formatter.should_receive(:add_example_group).with(example_group) + reporter.add_example_group(example_group) + reporter.example_finished(example, Spec::Example::ExamplePendingError.new("reason")) + end - describe Reporter, "reporting one pending example (PendingFixedError)" do - include ReporterSpecHelper - before(:each) {setup} + it "should account for pending example in stats" do + example = ExampleGroup.new("example") + formatter.should_receive(:example_pending).with(example, "reason") + formatter.should_receive(:start_dump) + formatter.should_receive(:dump_pending) + formatter.should_receive(:dump_summary).with(anything(), 1, 0, 1) + formatter.should_receive(:close).with(no_args) + formatter.should_receive(:add_example_group).with(example_group) + reporter.add_example_group(example_group) + reporter.example_finished(example, Spec::Example::ExamplePendingError.new("reason")) + reporter.dump + end + end - it "should tell formatter pending example is fixed" do - @formatter.should_receive(:example_failed) do |name, counter, failure| - failure.header.should == "'behaviour example' FIXED" + describe Reporter, "reporting one pending example (PendingExampleFixedError)" do + it "should tell formatter pending example is fixed" do + formatter.should_receive(:example_failed) do |name, counter, failure| + failure.header.should == "'example_group should do something' FIXED" + end + formatter.should_receive(:add_example_group).with(example_group) + reporter.add_example_group(example_group) + reporter.example_finished(example_group.examples.first, Spec::Example::PendingExampleFixedError.new("reason")) end - @formatter.should_receive(:add_behaviour).with(description("behaviour")) - @reporter.add_behaviour(description('behaviour')) - @reporter.example_finished("example", Spec::DSL::PendingFixedError.new("reason"), nil, false) end end end vendor/plugins/rspec/spec/spec/runner/reporter_spec.rb @@ -1,124 +1,79 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' -describe "c" do - - it "1" do - end - - it "2" do - end - -end - -describe "d" do - - it "3" do - end - - it "4" do - end - -end - -class SpecParserSubject -end - -describe SpecParserSubject do - - it "5" do - end - -end - -describe SpecParserSubject, "described" do - - it "6" do - end - -end - -describe SpecParserSubject, "described", :something => :something_else do - - it "7" do - end - -end - -describe "described", :something => :something_else do - - it "8" do - end - -end - - describe "SpecParser" do + attr_reader :parser, :file before(:each) do - @p = Spec::Runner::SpecParser.new + @parser = Spec::Runner::SpecParser.new + @file = "#{File.dirname(__FILE__)}/spec_parser/spec_parser_fixture.rb" + require file end it "should find spec name for 'specify' at same line" do - @p.spec_name_for(File.open(__FILE__), 5).should == "c 1" + parser.spec_name_for(file, 5).should == "c 1" end it "should find spec name for 'specify' at end of spec line" do - @p.spec_name_for(File.open(__FILE__), 6).should == "c 1" + parser.spec_name_for(file, 6).should == "c 1" end it "should find context for 'context' above all specs" do - @p.spec_name_for(File.open(__FILE__), 4).should == "c" + parser.spec_name_for(file, 4).should == "c" end it "should find spec name for 'it' at same line" do - @p.spec_name_for(File.open(__FILE__), 15).should == "d 3" + parser.spec_name_for(file, 15).should == "d 3" end it "should find spec name for 'it' at end of spec line" do - @p.spec_name_for(File.open(__FILE__), 16).should == "d 3" + parser.spec_name_for(file, 16).should == "d 3" end it "should find context for 'describe' above all specs" do - @p.spec_name_for(File.open(__FILE__), 14).should == "d" + parser.spec_name_for(file, 14).should == "d" end it "should find nearest example name between examples" do - @p.spec_name_for(File.open(__FILE__), 7).should == "c 1" + parser.spec_name_for(file, 7).should == "c 1" end it "should find nothing outside a context" do - @p.spec_name_for(File.open(__FILE__), 2).should be_nil + parser.spec_name_for(file, 2).should be_nil end - + it "should find context name for type" do - @p.spec_name_for(File.open(__FILE__), 26).should == "SpecParserSubject" + parser.spec_name_for(file, 26).should == "SpecParserSubject" end - + it "should find context and spec name for type" do - @p.spec_name_for(File.open(__FILE__), 28).should == "SpecParserSubject 5" + parser.spec_name_for(file, 28).should == "SpecParserSubject 5" end it "should find context and description for type" do - @p.spec_name_for(File.open(__FILE__), 33).should == "SpecParserSubject described" + parser.spec_name_for(file, 33).should == "SpecParserSubject described" end - + it "should find context and description and example for type" do - @p.spec_name_for(File.open(__FILE__), 36).should == "SpecParserSubject described 6" + parser.spec_name_for(file, 36).should == "SpecParserSubject described 6" end it "should find context and description for type with modifications" do - @p.spec_name_for(File.open(__FILE__), 40).should == "SpecParserSubject described" + parser.spec_name_for(file, 40).should == "SpecParserSubject described" end - + it "should find context and described and example for type with modifications" do - @p.spec_name_for(File.open(__FILE__), 43).should == "SpecParserSubject described 7" + parser.spec_name_for(file, 43).should == "SpecParserSubject described 7" end - - it "should find context and described for type with modifications" do - @p.spec_name_for(File.open(__FILE__), 47).should == "described" + + it "should find example group" do + parser.spec_name_for(file, 47).should == "described" end - - it "should find context and described for type with modifications" do - @p.spec_name_for(File.open(__FILE__), 50).should == "described 8" + + it "should find example" do + parser.spec_name_for(file, 50).should == "described 8" + end + + it "should find nested example" do + parser.spec_name_for(file, 63).should == "e f 11" end - + end vendor/plugins/rspec/spec/spec/runner/spec_parser_spec.rb @@ -51,6 +51,9 @@ module Spec [1] end + def items + @items_in_collection_with_size_method + end end class HandCodedMock @@ -96,6 +99,7 @@ module Spec end module Custom + require 'spec/runner/formatter/base_text_formatter' class Formatter < Spec::Runner::Formatter::BaseTextFormatter attr_reader :options, :where @@ -118,6 +122,12 @@ module Custom def initialize(options) @options = options end + + def diff_as_object(target, expected) + "" + end end end +class FakeReporter < Spec::Runner::Reporter +end vendor/plugins/rspec/spec/spec/spec_classes.rb @@ -8,7 +8,7 @@ module Spec class MyWorld attr :scenario_ran end - instance = MyWorld.new + instance = World.create(MyWorld) scenario = ScenarioBuilder.new.to_scenario do @scenario_ran = true end @@ -17,10 +17,10 @@ module Spec step = GivenScenario.new 'scenario name' # when - step.perform(instance) + step.perform(instance, nil) # then - ensure_that instance.scenario_ran, is(true) + instance.scenario_ran.should be_true end end end vendor/plugins/rspec/spec/spec/story/given_scenario_spec.rb @@ -15,11 +15,11 @@ module Spec scenarios = scenario_collector.scenarios # then - ensure_that scenarios.size, is(2) - ensure_that scenarios[0].name, is('scenario1') - ensure_that scenarios[0].story, is(story) - ensure_that scenarios[1].name, is('scenario2') - ensure_that scenarios[1].story, is(story) + scenario_collector.should have(2).scenarios + scenarios.first.name.should == 'scenario1' + scenarios.first.story.should equal(story) + scenarios.last.name.should == 'scenario2' + scenarios.last.story.should equal(story) end end end vendor/plugins/rspec/spec/spec/story/runner/scenario_collector_spec.rb @@ -20,7 +20,7 @@ module Spec scenario_runner.run(scenario, world) # then - ensure_that $answer, is(42) + $answer.should == 42 end it 'should allow scenarios to share methods' do @@ -69,75 +69,121 @@ module Spec scenario_runner.run(scenario, world) # then - # TODO verify_all end - - it 'should notify listeners when a scenario succeeds' do - # given - world = stub_everything('world') - story = Story.new 'story', 'narrative' do end - scenario = Scenario.new story, 'scenario1' do - # succeeds + describe "when a scenario succeeds" do + before(:each) do + # given + @world = stub_everything('world') + @story = Story.new 'story', 'narrative' do end + @scenario = Scenario.new @story, 'scenario1' do + # succeeds + end + @scenario_runner = ScenarioRunner.new end - scenario_runner = ScenarioRunner.new - mock_listener1 = stub_everything('listener1') - mock_listener2 = stub_everything('listener2') - scenario_runner.add_listener(mock_listener1) - scenario_runner.add_listener(mock_listener2) - - # expect - mock_listener1.should_receive(:scenario_succeeded).with('story', 'scenario1') - mock_listener2.should_receive(:scenario_succeeded).with('story', 'scenario1') - # when - scenario_runner.run(scenario, world) + it 'should notify listeners' do + #given + mock_listener1 = stub_everything('listener1') + mock_listener2 = stub_everything('listener2') + @scenario_runner.add_listener(mock_listener1) + @scenario_runner.add_listener(mock_listener2) + + # expect + mock_listener1.should_receive(:scenario_succeeded).with('story', 'scenario1') + mock_listener2.should_receive(:scenario_succeeded).with('story', 'scenario1') + + # when + @scenario_runner.run(@scenario, @world) + + # then + end - # then - # TODO verify_all + it "should return true" do + #when + success = @scenario_runner.run(@scenario, @world) + + #then + success.should == true + end end - - it 'should notify listeners when a scenario raises an error' do - # given - error = RuntimeError.new('oops') - story = Story.new 'title', 'narrative' do end - scenario = Scenario.new story, 'scenario1' do - raise error + + describe "when a scenario raises an error (other than a pending error)" do + before(:each) do + # given + @error = RuntimeError.new('oops') + @story = Story.new 'title', 'narrative' do end + @scenario = Scenario.new @story, 'scenario1' do + end + @scenario_runner = ScenarioRunner.new + @world = stub_everything + + # expect + @world.should_receive(:errors).twice.and_return([@error, @error]) end - scenario_runner = ScenarioRunner.new - mock_listener = stub_everything('listener') - scenario_runner.add_listener(mock_listener) - world = stub_everything - # expect - mock_listener.should_receive(:scenario_failed).with('title', 'scenario1', error) + it 'should notify listeners ONCE' do + #given + mock_listener = stub_everything('listener') + @scenario_runner.add_listener(mock_listener) + + #expect + mock_listener.should_receive(:scenario_failed).with('title', 'scenario1', @error).once + + # when + @scenario_runner.run @scenario, @world + + # then + end + + it "should return false" do + # when + success = @scenario_runner.run @scenario, @world + + # then + success.should == false + end - # when - scenario_runner.run scenario, world - # then - # TODO verify_all end - it 'should notify listeners when a scenario is pending' do - # given - story = Story.new 'title', 'narrative' do end - scenario = Scenario.new story, 'scenario1' do - pending 'todo' + describe "when a scenario is pending" do + before(:each) do + # given + @pending_error = Spec::Example::ExamplePendingError.new('todo') + @story = Story.new 'title', 'narrative' do end + @scenario = Scenario.new @story, 'scenario1' do + end + @scenario_runner = ScenarioRunner.new + @world = stub_everything + + # expect + @world.should_receive(:errors).twice.and_return([@pending_error, @pending_error]) end - scenario_runner = ScenarioRunner.new - mock_listener = mock('listener') - scenario_runner.add_listener(mock_listener) - world = World.create - # expect - mock_listener.should_receive(:scenario_started).with('title', 'scenario1') - mock_listener.should_receive(:scenario_pending).with('title', 'scenario1', 'todo') + it 'should notify listeners' do + #given + mock_listener = mock('listener') + @scenario_runner.add_listener(mock_listener) + + # expect + mock_listener.should_receive(:scenario_started).with('title', 'scenario1') + mock_listener.should_receive(:scenario_pending).with('title', 'scenario1', 'todo').once + + # when + @scenario_runner.run @scenario, @world + + # then + end + + it "should return true" do + # when + success = @scenario_runner.run @scenario, @world + + # then + success.should == true + end - # when - scenario_runner.run scenario, world - # then - # TODO verify_all end end end vendor/plugins/rspec/spec/spec/story/runner/scenario_runner_spec.rb @@ -14,11 +14,11 @@ module Spec stories = story_runner.stories # then - ensure_that stories.size, is(2) - ensure_that stories[0].title, is('title1') - ensure_that stories[0].narrative, is('narrative1') - ensure_that stories[1].title, is('title2') - ensure_that stories[1].narrative, is('narrative2') + story_runner.should have(2).stories + stories.first.title.should == 'title1' + stories.first.narrative.should == 'narrative1' + stories.last.title.should == 'title2' + stories.last.narrative.should == 'narrative2' end it 'should gather all the scenarios in the stories' do @@ -36,10 +36,10 @@ module Spec scenarios = story_runner.scenarios # then - ensure_that scenarios.size, is(3) - ensure_that scenarios[0].name, is('scenario1') - ensure_that scenarios[1].name, is('scenario2') - ensure_that scenarios[2].name, is('scenario3') + story_runner.should have(3).scenarios + scenarios[0].name.should == 'scenario1' + scenarios[1].name.should == 'scenario2' + scenarios[2].name.should == 'scenario3' end # captures worlds passed into a ScenarioRunner @@ -64,10 +64,48 @@ module Spec # then worlds = scenario_world_catcher.worlds - ensure_that worlds.size, is(2) + scenario_world_catcher.should have(2).worlds worlds[0].should_not == worlds[1] end + it "should return false if the scenario runner returns false ever" do + #given + stub_scenario_runner = stub_everything + story_runner = StoryRunner.new(stub_scenario_runner) + story_runner.Story 'story', 'narrative' do + Scenario 'scenario1' do end + Scenario 'scenario2' do end + end + + # expect + stub_scenario_runner.should_receive(:run).once.and_return(false,true) + + # when + success = story_runner.run_stories + + #then + success.should == false + end + + it "should return true if the scenario runner returns true for all scenarios" do + #given + stub_scenario_runner = stub_everything + story_runner = StoryRunner.new(stub_scenario_runner) + story_runner.Story 'story', 'narrative' do + Scenario 'scenario1' do end + Scenario 'scenario2' do end + end + + # expect + stub_scenario_runner.should_receive(:run).once.and_return(true,true) + + # when + success = story_runner.run_stories + + #then + success.should == true + end + it 'should use the provided world creator to create worlds' do # given stub_scenario_runner = stub_everything @@ -85,7 +123,6 @@ module Spec story_runner.run_stories # then - # TODO verify_all end it 'should notify listeners of the scenario count when the run starts' do @@ -112,7 +149,6 @@ module Spec story_runner.run_stories # then - # TODO verify_all end it 'should notify listeners when a story starts' do @@ -141,7 +177,6 @@ module Spec story_runner.run_stories # then - # TODO verify_all end it 'should notify listeners when the run ends' do @@ -163,7 +198,6 @@ module Spec story_runner.run_stories # then - # TODO verify_all end it 'should run a story in an instance of a specified class' do @@ -198,18 +232,16 @@ module Spec scenario_world_catcher.worlds[0].size.should == 3 end - it 'should store the current running story in the world' do + it 'should find a scenario in the current story by name' do # given - $stories = [] story_runner = StoryRunner.new(ScenarioRunner.new) - story_runner.Story 'title1', 'narrative1' do - Scenario 'scenario1' do - $stories << @current_story + $scenario = nil + + story_runner.Story 'title', 'narrative' do + Scenario 'first scenario' do end - end - story_runner.Story 'title2', 'narrative2' do - Scenario 'scenario2' do - $stories << @current_story + Scenario 'second scenario' do + $scenario = StoryRunner.scenario_from_current_story 'first scenario' end end @@ -217,29 +249,44 @@ module Spec story_runner.run_stories # then - $stories.size.should == 2 - ensure_that $stories[0].title, is('title1') - ensure_that $stories[1].title, is('title2') + $scenario.name.should == 'first scenario' end - - it 'should find a scenario in the current story by name' do - # given + + it "should clean the steps between stories" do + #given story_runner = StoryRunner.new(ScenarioRunner.new) - $scenario = nil + result = mock 'result' - story_runner.Story 'title', 'narrative' do + step1 = Step.new('step') do + result.one + end + steps1 = StepGroup.new + steps1.add :when, step1 + + story_runner.Story 'title', 'narrative', :steps_for => steps1 do Scenario 'first scenario' do + When 'step' end + end + + step2 = Step.new('step') do + result.two + end + steps2 = StepGroup.new + steps2.add :when, step2 + + story_runner.Story 'title2', 'narrative', :steps_for => steps2 do Scenario 'second scenario' do - $scenario = StoryRunner.scenario_from_current_story 'first scenario' + When 'step' end end - # when - story_runner.run_stories + #then + result.should_receive(:one) + result.should_receive(:two) - # then - $scenario.name.should == 'first scenario' + #when + story_runner.run_stories end end end vendor/plugins/rspec/spec/spec/story/runner/story_runner_spec.rb @@ -1,64 +1,93 @@ require File.dirname(__FILE__) + '/story_helper' +require 'spec/runner/formatter/story/plain_text_formatter' +require 'spec/runner/formatter/story/html_formatter' module Spec module Story - describe Runner do - def dev_null - io = StringIO.new - def io.write(str) - str.to_s.size - end - return io - end - - before :each do - Kernel.stub!(:at_exit) - @stdout, $stdout = $stdout, dev_null - @argv = Array.new(ARGV) - Runner.module_eval { @run_options = @story_runner = nil } + describe Runner, "module" do + before(:each) do + @world_creator = World.dup + @runner_module = Runner.dup + @runner_module.instance_eval {@story_runner = nil} + @runner_module.stub!(:register_exit_hook) end - after :each do - $stdout = @stdout - ARGV.replace @argv - Runner.module_eval { @run_options = @story_runner = nil } + def create_options(args=[]) + Spec::Runner::OptionParser.parse(args, StringIO.new, StringIO.new) end it 'should wire up a singleton StoryRunner' do - Runner.story_runner.should_not be_nil + @runner_module.story_runner.should_not be_nil end it 'should set its options based on ARGV' do # given - ARGV << '--dry-run' - + @runner_module.should_receive(:run_options).and_return( + create_options(['--dry-run']) + ) + # when - options = Runner.run_options + options = @runner_module.run_options # then - ensure_that options.dry_run, is(true) + options.dry_run.should be_true end + + describe "initialization" do + + before(:each) do + # given + @story_runner = mock('story runner', :null_object => true) + @scenario_runner = mock('scenario runner', :null_object => true) + @world_creator = mock('world', :null_object => true) + + @runner_module.stub!(:world_creator).and_return(@world_creator) + @runner_module.stub!(:create_story_runner).and_return(@story_runner) + @runner_module.stub!(:scenario_runner).and_return(@scenario_runner) + end - it 'should add a documenter to the runner classes if one is specified' do - # given - ARGV << "--format" << "specdoc" - story_runner = mock('story runner') - scenario_runner = mock('scenario runner') + it 'should add a reporter to the runner classes' do + @runner_module.should_receive(:run_options).and_return( + create_options + ) - story_runner.stub!(:add_listener).with(an_instance_of(Reporter::PlainTextReporter)) - scenario_runner.stub!(:add_listener).with(an_instance_of(Reporter::PlainTextReporter)) + # expect + @world_creator.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter)) + @story_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter)) + @scenario_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter)) + + # when + @runner_module.story_runner + end + + it 'should add a documenter to the runner classes if one is specified' do + + @runner_module.should_receive(:run_options).and_return( + create_options(["--format","html"]) + ) - Runner::StoryRunner.stub!(:new).and_return(story_runner) - Runner::ScenarioRunner.stub!(:new).and_return(scenario_runner) + # expect + @world_creator.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter)) + @story_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter)) + @scenario_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter)) + + # when + @runner_module.story_runner + end + + it 'should add any registered listener to the runner classes' do + # given + listener = Object.new - # expect - World.should_receive(:add_listener).with(an_instance_of(Documenter::PlainTextDocumenter)) - story_runner.should_receive(:add_listener).with(an_instance_of(Documenter::PlainTextDocumenter)) - scenario_runner.should_receive(:add_listener).with(an_instance_of(Documenter::PlainTextDocumenter)) + # expect + @world_creator.should_receive(:add_listener).with(listener) + @story_runner.should_receive(:add_listener).with(listener) + @scenario_runner.should_receive(:add_listener).with(listener) - # when - Runner.story_runner + # when + @runner_module.register_listener listener + end + end end - end end end vendor/plugins/rspec/spec/spec/story/runner_spec.rb @@ -6,8 +6,8 @@ module Spec it 'should store a step by name and type' do # given step_mother = StepMother.new - step = SimpleStep.new("a given", &lambda {}) - step_mother.store(:given, "a given", step) + step = Step.new("a given", &lambda {}) + step_mother.store(:given, step) # when found = step_mother.find(:given, "a given") @@ -35,18 +35,18 @@ module Spec step = step_mother.find(:given, "doesn't exist") # then - step.should be_an_instance_of(SimpleStep) + step.should be_an_instance_of(Step) lambda do - step.perform(Object.new) - end.should raise_error(Spec::DSL::ExamplePendingError, /Unimplemented/) + step.perform(Object.new, "doesn't exist") + end.should raise_error(Spec::Example::ExamplePendingError, /Unimplemented/) end it 'should clear itself' do # given step_mother = StepMother.new - step = SimpleStep.new("a given") do end - step_mother.store(:given, "a given", step) + step = Step.new("a given") do end + step_mother.store(:given, step) # when step_mother.clear @@ -54,6 +54,19 @@ module Spec # then step_mother.should be_empty end + + it "should use assigned steps" do + step_mother = StepMother.new + + step = Step.new('step') {} + step_group = StepGroup.new + step_group.add(:given, step) + + step_mother.use(step_group) + + step_mother.find(:given, "step").should equal(step) + end + end end end vendor/plugins/rspec/spec/spec/story/step_mother_spec.rb @@ -1,3 +1,2 @@ require File.dirname(__FILE__) + '/../../spec_helper' -require File.dirname(__FILE__) + '/rspec_adapter' require File.dirname(__FILE__) + '/builders' vendor/plugins/rspec/spec/spec/story/story_helper.rb @@ -28,7 +28,7 @@ module Spec error.should be_nil end - it "should raise when error raised running in another object" do + it "should raise an error when an error is raised running in another object" do #given story = Story.new 'title', 'narrative' do raise "this is raised in the story" @@ -40,6 +40,47 @@ module Spec story.run_in(object) end.should raise_error end + + it "should use the steps it is told to using a StepGroup" do + story = Story.new("title", "narrative", :steps_for => steps = StepGroup.new) do end + assignee = mock("assignee") + assignee.should_receive(:use).with(steps) + story.assign_steps_to(assignee) + end + + it "should use the steps it is told to using a key" do + begin + orig_rspec_story_steps = $rspec_story_steps + $rspec_story_steps = StepGroupHash.new + $rspec_story_steps[:foo] = steps = Object.new + + story = Story.new("title", "narrative", :steps_for => :foo) do end + assignee = mock("assignee") + + assignee.should_receive(:use).with(steps) + story.assign_steps_to(assignee) + ensure + $rspec_story_steps = orig_rspec_story_steps + end + end + + it "should use the steps it is told to using multiple keys" do + begin + orig_rspec_story_steps = $rspec_story_steps + $rspec_story_steps = StepGroupHash.new + $rspec_story_steps[:foo] = foo_steps = Object.new + $rspec_story_steps[:bar] = bar_steps = Object.new + + story = Story.new("title", "narrative", :steps_for => [:foo, :bar]) do end + assignee = mock("assignee") + + assignee.should_receive(:use).with(foo_steps) + assignee.should_receive(:use).with(bar_steps) + story.assign_steps_to(assignee) + ensure + $rspec_story_steps = orig_rspec_story_steps + end + end end end end vendor/plugins/rspec/spec/spec/story/story_spec.rb @@ -8,80 +8,80 @@ module Spec before :each do World.listeners.clear end - + after :each do World.listeners.clear World.step_mother.clear end - + it 'should create an object that mixes in a World' do # when obj = World::create - + # then obj.should be_kind_of(World) end - + it 'should create a World from any object type' do # when obj = World::create String - + # then obj.should be_kind_of(String) obj.should be_kind_of(World) end - + it 'should pass arguments to #new when creating an object of a specified type that mixes in a world' do # given Thing = Struct.new(:name, :age) - + # when obj = World::create Thing, "David", "I'm not telling" - + # then obj.should be_an_instance_of(Thing) obj.name.should == "David" obj.age.should == "I'm not telling" obj.should be_kind_of(World) end - + def ensure_world_executes_step(&block) # given obj = World::create $step_ran = false - + # when obj.instance_eval(&block) - + # then $step_ran.should be_true end - + it 'should execute a Given, When or Then step' do ensure_world_executes_step do Given 'a given' do $step_ran = true end end - + ensure_world_executes_step do When 'an event' do $step_ran = true end end - + ensure_world_executes_step do Then 'an outcome' do $step_ran = true end end end - + it 'should interpret Given... And... as multiple givens' do # given world = World.create $steps = [] - + # when world.instance_eval do Given 'step 1' do @@ -91,18 +91,18 @@ module Spec $steps << 2 end end - + # then $steps.should == [1,2] World.step_mother.find(:given, 'step 1').should_not be_nil World.step_mother.find(:given, 'step 2').should_not be_nil end - + it 'should interpret When... And... as multiple events' do # given world = World.create $steps = [] - + # when world.instance_eval do When 'step 1' do @@ -112,18 +112,18 @@ module Spec $steps << 2 end end - + # then $steps.should == [1,2] World.step_mother.find(:when, 'step 1').should_not be_nil World.step_mother.find(:when, 'step 2').should_not be_nil end - + it 'should interpret Then... And... as multiple outcomes' do # given world = World.create $steps = [] - + # when world.instance_eval do Then 'step 1' do @@ -133,13 +133,13 @@ module Spec $steps << 2 end end - + # then $steps.should == [1,2] World.step_mother.find(:then, 'step 1').should_not be_nil World.step_mother.find(:then, 'step 2').should_not be_nil - end - + end + it 'should reuse a given across scenarios' do # given $num_invoked = 0 @@ -150,16 +150,16 @@ module Spec end end another_world = World::create - + # when another_world.instance_eval do Given 'a given' # without a body end - + # then $num_invoked.should == 2 end - + it 'should reuse an event across scenarios' do # given $num_invoked = 0 @@ -169,18 +169,18 @@ module Spec $num_invoked += 1 end end - + another_world = World::create - + # when another_world.instance_eval do When 'an event' # without a body end - + # then $num_invoked.should == 2 end - + it 'should reuse an outcome across scenarios' do # given $num_invoked = 0 @@ -190,24 +190,24 @@ module Spec $num_invoked += 1 end end - + another_world = World::create - + # when another_world.instance_eval do Then 'an outcome' # without a body end - + # then $num_invoked.should == 2 end - + it 'should preserve instance variables between steps within a scenario' do # given world = World::create $first = nil $second = nil - + # when world.instance_eval do Given 'given' do @@ -221,12 +221,12 @@ module Spec $second = @second # from event end end - + # then - ensure_that $first, is('first') - ensure_that $second, is('first') + $first.should == 'first' + $second.should == 'first' end - + it 'should invoke a reused step in the new object instance' do # given $instances = [] @@ -238,7 +238,7 @@ module Spec end end world2 = World.create - + # when world2.instance_eval do Given 'a given' # reused @@ -250,41 +250,45 @@ module Spec # then $instances.should == [ world1.__id__, world2.__id__, world2.__id__ ] end - - def ensure_world_propagates_error(expected_error, &block) + + def ensure_world_collects_error(expected_error, &block) # given world = World.create - $error = nil - + # $error = nil + # when - error = exception_from do - world.instance_eval(&block) - end - + world.start_collecting_errors + world.instance_eval(&block) + # then - error.should be_kind_of(expected_error) + world.should have(1).errors + world.errors[0].should be_kind_of(expected_error) end - - it 'should propagate a failure from a Given, When or Then step' do - ensure_world_propagates_error RuntimeError do + + it 'should collect a failure from a Given step' do + ensure_world_collects_error RuntimeError do Given 'a given' do raise RuntimeError, "oops" end end - - ensure_world_propagates_error RuntimeError do + end + + it 'should collect a failure from a When step' do + ensure_world_collects_error RuntimeError do When 'an event' do raise RuntimeError, "oops" end end - - ensure_world_propagates_error RuntimeError do + end + + it 'should collect a failure from a Then step' do + ensure_world_collects_error RuntimeError do Then 'an outcome' do raise RuntimeError, "oops" end end end - + it 'should inform listeners when it runs a Given, When or Then step' do # given world = World.create @@ -292,27 +296,32 @@ module Spec mock_listener2 = mock('listener2') World.add_listener(mock_listener1) World.add_listener(mock_listener2) - + # expect - mock_listener1.should_receive(:found_step).with(:given, 'a context') - mock_listener1.should_receive(:found_step).with(:when, 'an event') - mock_listener1.should_receive(:found_step).with(:then, 'an outcome') - - mock_listener2.should_receive(:found_step).with(:given, 'a context') - mock_listener2.should_receive(:found_step).with(:when, 'an event') - mock_listener2.should_receive(:found_step).with(:then, 'an outcome') - + mock_listener1.should_receive(:step_upcoming).with(:given, 'a context') + mock_listener1.should_receive(:step_succeeded).with(:given, 'a context') + mock_listener1.should_receive(:step_upcoming).with(:when, 'an event') + mock_listener1.should_receive(:step_succeeded).with(:when, 'an event') + mock_listener1.should_receive(:step_upcoming).with(:then, 'an outcome') + mock_listener1.should_receive(:step_succeeded).with(:then, 'an outcome') + + mock_listener2.should_receive(:step_upcoming).with(:given, 'a context') + mock_listener2.should_receive(:step_succeeded).with(:given, 'a context') + mock_listener2.should_receive(:step_upcoming).with(:when, 'an event') + mock_listener2.should_receive(:step_succeeded).with(:when, 'an event') + mock_listener2.should_receive(:step_upcoming).with(:then, 'an outcome') + mock_listener2.should_receive(:step_succeeded).with(:then, 'an outcome') + # when world.instance_eval do Given 'a context' do end When 'an event' do end Then 'an outcome' do end end - + # then - # TODO verify_all end - + it 'should tell listeners but not execute the step in dry-run mode' do # given Runner.stub!(:dry_run).and_return(true) @@ -320,54 +329,54 @@ module Spec World.add_listener(mock_listener) $step_invoked = false world = World.create - + # expect - mock_listener.should_receive(:found_step).with(:given, 'a context') - + mock_listener.should_receive(:step_upcoming).with(:given, 'a context') + mock_listener.should_receive(:step_succeeded).with(:given, 'a context') + # when world.instance_eval do Given 'a context' do $step_invoked = true end end - + # then - # TODO verify_all $step_invoked.should be(false) end - + it 'should suppress listeners while it runs a GivenScenario' do # given $scenario_ran = false - + scenario = ScenarioBuilder.new.name('a scenario').to_scenario do $scenario_ran = true Given 'given' do end When 'event' do end Then 'outcome' do end end - + given_scenario = GivenScenario.new('a scenario') Runner::StoryRunner.should_receive(:scenario_from_current_story). with('a scenario').and_return(scenario) - + world = World.create listener = mock('listener') - World.add_listener(listener) - + World.add_listener(listener) + # expect - listener.should_receive(:found_step).with(:'given scenario', 'a scenario') - listener.should_receive(:found_step).never.with(:given, 'given') - listener.should_receive(:found_step).never.with(:when, 'event') - listener.should_receive(:found_step).never.with(:then, 'outcome') - + listener.should_receive(:found_scenario).with(:'given scenario', 'a scenario') + listener.should_receive(:step_succeeded).never.with(:given, 'given') + listener.should_receive(:step_succeeded).never.with(:when, 'event') + listener.should_receive(:step_succeeded).never.with(:then, 'outcome') + # when world.GivenScenario 'a scenario' - + # then - # TODO verify_all $scenario_ran.should be_true end + it 'should interpret GivenScenario... And... as multiple givens' do # given world = World.create @@ -378,7 +387,7 @@ module Spec end Runner::StoryRunner.should_receive(:scenario_from_current_story). with('a scenario').and_return(scenario) - + # when world.instance_eval do GivenScenario 'a scenario' @@ -386,21 +395,29 @@ module Spec $steps << 2 end end - + # then $steps.should == [1,2] World.step_mother.find(:given, 'step 2').should_not be_nil end - + it 'should provide rspec matchers' do # given world = World.create - + # then world.instance_eval do 'hello'.should match(/^hello$/) end end + + it "should use assigned matchers" do + world = World.create + + World.should_receive(:use).with(steps = Object.new) + + World.use(steps) + end end end end vendor/plugins/rspec/spec/spec/story/world_spec.rb @@ -1,4 +1,5 @@ require File.dirname(__FILE__) + '/../spec_helper.rb' +require 'spec/translator' describe "Translator" do before do vendor/plugins/rspec/spec/spec/translator_spec.rb @@ -1,6 +1,4 @@ require 'stringio' -require 'rbconfig' -require 'tmpdir' dir = File.dirname(__FILE__) lib_path = File.expand_path("#{dir}/../lib") @@ -9,6 +7,7 @@ $_spec_spec = true # Prevents Kernel.exit in various places require 'spec' require 'spec/mocks' +require 'spec/story' spec_classes_path = File.expand_path("#{dir}/../spec/spec/spec_classes") require spec_classes_path unless $LOAD_PATH.include?(spec_classes_path) require File.dirname(__FILE__) + '/../lib/spec/expectations/differs/default' @@ -41,25 +40,64 @@ module Spec def pass Pass.new end + + class CorrectlyOrderedMockExpectation + def initialize(&event) + @event = event + end + + def expect(&expectations) + expectations.call + @event.call + end + end + + def during(&block) + CorrectlyOrderedMockExpectation.new(&block) + end end end class NonStandardError < Exception; end -describe "Test::Unit io sink", :shared => true do - before do - @test_runner_io = StringIO.new - end - - after do - end -end - module Custom - class BehaviourRunner + class ExampleGroupRunner attr_reader :options, :arg def initialize(options, arg) @options, @arg = options, arg end + + def load_files(files) + end + + def run + end end +end + +def exception_from(&block) + exception = nil + begin + yield + rescue StandardError => e + exception = e + end + exception +end + +describe "sandboxed rspec_options", :shared => true do + attr_reader :options + + before(:all) do + @original_rspec_options = $rspec_options + end + + before(:each) do + @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new) + $rspec_options = options + end + + after do + $rspec_options = @original_rspec_options + end end \ No newline at end of file vendor/plugins/rspec/spec/spec_helper.rb vendor/plugins/rspec/autotest/discover.rb vendor/plugins/rspec/autotest/rspec.rb vendor/plugins/rspec/examples/auto_spec_description_example.rb vendor/plugins/rspec/examples/before_and_after_example.rb vendor/plugins/rspec/examples/behave_as_example.rb vendor/plugins/rspec/examples/custom_expectation_matchers.rb vendor/plugins/rspec/examples/custom_formatter.rb vendor/plugins/rspec/examples/dynamic_spec.rb vendor/plugins/rspec/examples/file_accessor.rb vendor/plugins/rspec/examples/file_accessor_spec.rb vendor/plugins/rspec/examples/greeter_spec.rb vendor/plugins/rspec/examples/helper_method_example.rb vendor/plugins/rspec/examples/io_processor.rb vendor/plugins/rspec/examples/io_processor_spec.rb vendor/plugins/rspec/examples/legacy_spec.rb vendor/plugins/rspec/examples/mocking_example.rb vendor/plugins/rspec/examples/multi_threaded_behaviour_runner.rb vendor/plugins/rspec/examples/partial_mock_example.rb vendor/plugins/rspec/examples/pending_example.rb vendor/plugins/rspec/examples/predicate_example.rb vendor/plugins/rspec/examples/priority.txt vendor/plugins/rspec/examples/shared_behaviours_example.rb vendor/plugins/rspec/examples/spec_and_test_together.rb vendor/plugins/rspec/examples/spec_helper.rb vendor/plugins/rspec/examples/stack.rb vendor/plugins/rspec/examples/stack_spec.rb vendor/plugins/rspec/examples/story/game-of-life/.loadpath vendor/plugins/rspec/examples/story/game-of-life/README.txt vendor/plugins/rspec/examples/story/game-of-life/behaviour/everything.rb vendor/plugins/rspec/examples/story/game-of-life/behaviour/examples/examples.rb vendor/plugins/rspec/examples/story/game-of-life/behaviour/examples/game_behaviour.rb vendor/plugins/rspec/examples/story/game-of-life/behaviour/examples/grid_behaviour.rb vendor/plugins/rspec/examples/story/game-of-life/behaviour/stories/CellsWithLessThanTwoNeighboursDie.story vendor/plugins/rspec/examples/story/game-of-life/behaviour/stories/CellsWithMoreThanThreeNeighboursDie.story vendor/plugins/rspec/examples/story/game-of-life/behaviour/stories/EmptySpacesWithThreeNeighboursCreateACell.story vendor/plugins/rspec/examples/story/game-of-life/behaviour/stories/ICanCreateACell.story vendor/plugins/rspec/examples/story/game-of-life/behaviour/stories/ICanKillACell.story vendor/plugins/rspec/examples/story/game-of-life/behaviour/stories/TheGridWraps.story vendor/plugins/rspec/examples/story/game-of-life/behaviour/stories/create_a_cell.rb vendor/plugins/rspec/examples/story/game-of-life/behaviour/stories/kill_a_cell.rb vendor/plugins/rspec/examples/story/game-of-life/behaviour/stories/stories.rb vendor/plugins/rspec/examples/story/game-of-life/behaviour/stories/stories.txt vendor/plugins/rspec/examples/story/game-of-life/life.rb vendor/plugins/rspec/examples/story/game-of-life/life/game.rb vendor/plugins/rspec/examples/story/game-of-life/life/grid.rb vendor/plugins/rspec/examples/stubbing_example.rb vendor/plugins/rspec/examples/test_case_adapter_example.rb vendor/plugins/rspec/lib/spec/dsl.rb vendor/plugins/rspec/lib/spec/dsl/behaviour.rb vendor/plugins/rspec/lib/spec/dsl/behaviour_description.rb vendor/plugins/rspec/lib/spec/dsl/behaviour_factory.rb vendor/plugins/rspec/lib/spec/dsl/configuration.rb vendor/plugins/rspec/lib/spec/dsl/errors.rb vendor/plugins/rspec/lib/spec/dsl/example.rb vendor/plugins/rspec/lib/spec/dsl/example_definition.rb vendor/plugins/rspec/lib/spec/dsl/example_matcher.rb vendor/plugins/rspec/lib/spec/dsl/example_module.rb vendor/plugins/rspec/lib/spec/dsl/example_runner.rb vendor/plugins/rspec/lib/spec/dsl/example_suite.rb vendor/plugins/rspec/lib/spec/dsl/shared_behaviour.rb vendor/plugins/rspec/lib/spec/dsl/should_raise_handler.rb vendor/plugins/rspec/lib/spec/dsl/supports_pending.rb vendor/plugins/rspec/lib/spec/runner/behaviour_runner.rb vendor/plugins/rspec/lib/spec/runner/extensions/object.rb vendor/plugins/rspec/lib/spec/runner/formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/failing_behaviours_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/rdoc_formatter.rb vendor/plugins/rspec/lib/spec/story/documenter.rb vendor/plugins/rspec/lib/spec/story/documenter/plain_text_documenter.rb vendor/plugins/rspec/lib/spec/story/reporter.rb vendor/plugins/rspec/lib/spec/story/reporter/plain_text_reporter.rb vendor/plugins/rspec/lib/spec/story/simple_step.rb vendor/plugins/rspec/lib/spec/test.rb vendor/plugins/rspec/lib/spec/test/unit/autorunner.rb vendor/plugins/rspec/lib/spec/test/unit/example.rb vendor/plugins/rspec/lib/spec/test/unit/rspectestresult.rb vendor/plugins/rspec/lib/spec/test/unit/ui/console/testrunner.rb vendor/plugins/rspec/lib/spec/test/unit/ui/testrunnermediator.rb vendor/plugins/rspec/lib/spec/test_case_adapter.rb vendor/plugins/rspec/rake_tasks/examples_rdoc.rake vendor/plugins/rspec/spec.opts vendor/plugins/rspec/spec/spec/dsl/behaviour_description_spec.rb vendor/plugins/rspec/spec/spec/dsl/configuration_spec.rb vendor/plugins/rspec/spec/spec/dsl/example_class_definition_spec.rb vendor/plugins/rspec/spec/spec/dsl/example_definition_class_spec.rb vendor/plugins/rspec/spec/spec/dsl/example_definition_spec.rb vendor/plugins/rspec/spec/spec/dsl/example_factory_spec.rb vendor/plugins/rspec/spec/spec/dsl/example_instance_spec.rb vendor/plugins/rspec/spec/spec/dsl/example_matcher_spec.rb vendor/plugins/rspec/spec/spec/dsl/example_should_raise_spec.rb vendor/plugins/rspec/spec/spec/dsl/example_spec.rb vendor/plugins/rspec/spec/spec/dsl/example_suite_spec.rb vendor/plugins/rspec/spec/spec/dsl/predicate_matcher_spec.rb vendor/plugins/rspec/spec/spec/dsl/shared_behaviour_spec.rb vendor/plugins/rspec/spec/spec/dsl/supports_pending_spec.rb vendor/plugins/rspec/spec/spec/runner/autorunner_spec.rb vendor/plugins/rspec/spec/spec/runner/extensions/bug_report_10577_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/failing_behaviours_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_dry_run_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_failure_dump_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/rdoc_formatter_dry_run_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/rdoc_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/specdoc_formatter_dry_run_spec.rb vendor/plugins/rspec/spec/spec/runner/object_ext_spec.rb vendor/plugins/rspec/spec/spec/story/documenter/plain_text_documenter_spec.rb vendor/plugins/rspec/spec/spec/story/reporter/plain_text_reporter_spec.rb vendor/plugins/rspec/spec/spec/story/rspec_adapter.rb vendor/plugins/rspec/spec/spec/story/simple_step_spec.rb vendor/plugins/rspec/spec/spec/test/unit/test_unit_and_rspec_spec.rb vendor/plugins/rspec_on_rails/MIT-LICENSE vendor/plugins/rspec_on_rails/README vendor/plugins/rspec_on_rails/Rakefile vendor/plugins/rspec_on_rails/generators/rspec/CHANGES vendor/plugins/rspec_on_rails/generators/rspec/rspec_generator.rb vendor/plugins/rspec_on_rails/generators/rspec/templates/all_stories.rb vendor/plugins/rspec_on_rails/generators/rspec/templates/previous_failures.txt vendor/plugins/rspec_on_rails/generators/rspec/templates/script/spec vendor/plugins/rspec_on_rails/generators/rspec/templates/script/spec_server vendor/plugins/rspec_on_rails/generators/rspec/templates/spec.opts vendor/plugins/rspec_on_rails/generators/rspec/templates/spec_helper.rb vendor/plugins/rspec_on_rails/generators/rspec/templates/stories_helper.rb vendor/plugins/rspec_on_rails/generators/rspec_controller/USAGE vendor/plugins/rspec_on_rails/generators/rspec_controller/rspec_controller_generator.rb vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/controller_spec.rb vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/helper_spec.rb vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/view_spec.rb vendor/plugins/rspec_on_rails/generators/rspec_model/USAGE vendor/plugins/rspec_on_rails/generators/rspec_model/rspec_model_generator.rb vendor/plugins/rspec_on_rails/generators/rspec_model/templates/model_spec.rb vendor/plugins/rspec_on_rails/generators/rspec_scaffold/rspec_scaffold_generator.rb vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/controller_spec.rb vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/edit_erb_spec.rb vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/helper_spec.rb vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/index_erb_spec.rb vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/new_erb_spec.rb vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/show_erb_spec.rb vendor/plugins/rspec_on_rails/init.rb vendor/plugins/rspec_on_rails/lib/autotest/rails_rspec.rb vendor/plugins/rspec_on_rails/lib/spec/dsl.rb vendor/plugins/rspec_on_rails/lib/spec/dsl/configuration.rb vendor/plugins/rspec_on_rails/lib/spec/matchers.rb vendor/plugins/rspec_on_rails/lib/spec/matchers/have.rb vendor/plugins/rspec_on_rails/lib/spec/rails.rb vendor/plugins/rspec_on_rails/lib/spec/rails/dsl.rb vendor/plugins/rspec_on_rails/lib/spec/rails/dsl/assigns_hash_proxy.rb vendor/plugins/rspec_on_rails/lib/spec/rails/dsl/behaviour.rb vendor/plugins/rspec_on_rails/lib/spec/rails/dsl/behaviour/controller_example.rb vendor/plugins/rspec_on_rails/lib/spec/rails/dsl/behaviour/functional_example.rb vendor/plugins/rspec_on_rails/lib/spec/rails/dsl/behaviour/helper_example.rb vendor/plugins/rspec_on_rails/lib/spec/rails/dsl/behaviour/model_example.rb vendor/plugins/rspec_on_rails/lib/spec/rails/dsl/behaviour/rails_example.rb vendor/plugins/rspec_on_rails/lib/spec/rails/dsl/behaviour/render_observer.rb vendor/plugins/rspec_on_rails/lib/spec/rails/dsl/behaviour/view_example.rb vendor/plugins/rspec_on_rails/lib/spec/rails/dsl/ivar_proxy.rb vendor/plugins/rspec_on_rails/lib/spec/rails/extensions.rb vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/base.rb vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/rescue.rb vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/test_response.rb vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_view/base.rb vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/active_record/base.rb vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/active_record/oracle_adapter_patch.rb vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/object.rb vendor/plugins/rspec_on_rails/lib/spec/rails/matchers.rb vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/assert_select.rb vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/have_text.rb vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/redirect_to.rb vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/render_template.rb vendor/plugins/rspec_on_rails/lib/spec/rails/story_adapter.rb vendor/plugins/rspec_on_rails/lib/spec/rails/version.rb vendor/plugins/rspec_on_rails/spec/rails/autotest/mappings_spec.rb vendor/plugins/rspec_on_rails/spec/rails/autotest/rails_rspec_spec.rb vendor/plugins/rspec_on_rails/spec/rails/dsl/assigns_hash_proxy_spec.rb vendor/plugins/rspec_on_rails/spec/rails/dsl/behaviour_factory_spec.rb vendor/plugins/rspec_on_rails/spec/rails/dsl/configuration_spec.rb vendor/plugins/rspec_on_rails/spec/rails/dsl/controller_isolation_spec.rb vendor/plugins/rspec_on_rails/spec/rails/dsl/controller_spec_spec.rb vendor/plugins/rspec_on_rails/spec/rails/dsl/helper_spec_spec.rb vendor/plugins/rspec_on_rails/spec/rails/dsl/ivar_proxy_spec.rb vendor/plugins/rspec_on_rails/spec/rails/dsl/model_spec_spec.rb vendor/plugins/rspec_on_rails/spec/rails/dsl/shared_behaviour_spec.rb vendor/plugins/rspec_on_rails/spec/rails/dsl/test_unit_assertion_accessibility_spec.rb vendor/plugins/rspec_on_rails/spec/rails/dsl/view_spec_spec.rb vendor/plugins/rspec_on_rails/spec/rails/extensions/action_controller_rescue_action_spec.rb vendor/plugins/rspec_on_rails/spec/rails/extensions/action_view_base_spec.rb vendor/plugins/rspec_on_rails/spec/rails/extensions/active_record_spec.rb vendor/plugins/rspec_on_rails/spec/rails/matchers/assert_select_spec.rb vendor/plugins/rspec_on_rails/spec/rails/matchers/description_generation_spec.rb vendor/plugins/rspec_on_rails/spec/rails/matchers/errors_on_spec.rb vendor/plugins/rspec_on_rails/spec/rails/matchers/redirect_to_spec.rb vendor/plugins/rspec_on_rails/spec/rails/matchers/render_spec.rb vendor/plugins/rspec_on_rails/spec/rails/mocks/mock_model_spec.rb vendor/plugins/rspec_on_rails/spec/rails/sample_spec.rb vendor/plugins/rspec_on_rails/spec/rails/spec_server_spec.rb vendor/plugins/rspec_on_rails/spec/rails/spec_spec.rb vendor/plugins/rspec_on_rails/spec/rails_suite.rb vendor/plugins/rspec_on_rails/spec/spec_helper.rb vendor/plugins/rspec_on_rails/spec_resources/controllers/action_view_base_spec_controller.rb vendor/plugins/rspec_on_rails/spec_resources/controllers/controller_spec_controller.rb vendor/plugins/rspec_on_rails/spec_resources/controllers/redirect_spec_controller.rb vendor/plugins/rspec_on_rails/spec_resources/controllers/render_spec_controller.rb vendor/plugins/rspec_on_rails/spec_resources/controllers/rjs_spec_controller.rb vendor/plugins/rspec_on_rails/spec_resources/helpers/explicit_helper.rb vendor/plugins/rspec_on_rails/spec_resources/helpers/more_explicit_helper.rb vendor/plugins/rspec_on_rails/spec_resources/helpers/plugin_application_helper.rb vendor/plugins/rspec_on_rails/spec_resources/helpers/view_spec_helper.rb vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/_partial.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_the_assigns_hash.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_with_errors_in_template.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_with_template.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/_a_partial.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.js.rjs vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.rjs vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/_replacement_partial.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/hide_div.rjs vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/hide_page_element.rjs vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/insert_html.rjs vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace.rjs vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace_html.rjs vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace_html_with_partial.rjs vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/visual_effect.rjs vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/visual_toggle_effect.rjs vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/no_tags.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/single_div_with_no_attributes.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/single_div_with_one_attribute.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_used_twice.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_with_local_variable.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_with_sub_partial.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_spacer.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/accessor.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/entry_form.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/explicit_helper.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/foo/show.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/implicit_helper.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/multiple_helpers.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial_using_collection.rhtml vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial_with_array.rhtml vendor/plugins/rspec_on_rails/tasks/rspec.rake 16d0139ed412d2d7d7a8b1caf102932c1d3d155d Josh Owens joshua.owens@gmail.com http://github.com/queso/signal-wiki/commit/c173ad3217572f98b2b28b8eabc9a7787cbe290c c173ad3217572f98b2b28b8eabc9a7787cbe290c 2008-04-18T11:34:34-07:00 2008-04-18T11:34:34-07:00 Moving to edge rspec and getting most tests back in working order. 6e3d98c372855ef13a3757de13d524a5e9eff421 Josh Owens joshua.owens@gmail.com