aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/helpers/test_helper.rb3
2 files changed, 4 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 92fad1aa79..d61a3b3135 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Added web_service generator (run ./script/generate web_service for help) #776 [Leon Bredt]
+
* Added app/apis and components to code statistics report #729 [Scott Barron]
* Fixed WEBrick server to use ABSOLUTE_RAILS_ROOT instead of working_directory #687 [Nicholas Seckar]
diff --git a/railties/helpers/test_helper.rb b/railties/helpers/test_helper.rb
index e560caa79d..d177ec3515 100644
--- a/railties/helpers/test_helper.rb
+++ b/railties/helpers/test_helper.rb
@@ -5,10 +5,11 @@ require 'application'
require 'test/unit'
require 'active_record/fixtures'
require 'action_controller/test_process'
+require 'action_web_service/test_invoke'
require 'breakpoint'
def create_fixtures(*table_names)
Fixtures.create_fixtures(File.dirname(__FILE__) + "/fixtures", table_names)
end
-Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/" \ No newline at end of file
+Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"