fix tests for the latest TypeScript compiler

gfx · gfx · commit 03bd63d6a0cd · 2014-07-30T08:25:39.000+09:00
diff --git a/Gemfile b/Gemfile
@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in typescript-rails.gemspec
 gemspec
 
-gem 'rails', '~> 3.2.0'
+gem 'rails', '~> 4.0'
diff --git a/test/template_handler_test.rb b/test/template_handler_test.rb
@@ -23,27 +23,33 @@ def app
     @app ||= DummyApp
   end
 
+  def source
+    # source without comments
+    last_response.body.gsub(%r{^//[^\n]*}m, '')
+  end
+
   test "typescript views are served as javascript" do
     get "/site/index.js"
-
-    s = last_response.body
-    assert_match /var x = 5;\s*/, last_response.body
+    assert_match /var x = 5;\s*/,
+        source
   end
 
   test "<reference> to other .ts file works" do
     get "/site/ref1_2.js"
-    assert_match /var f = function \(x, y\) \{\s*return x \+ y;\s*\};\s*f\(1, 2\);\s*/, last_response.body
+    assert_match /var f = function \(x, y\) \{\s*return x \+ y;\s*\};\s*f\(1, 2\);\s*/,
+        source
   end
 
   test "<reference> to other .d.ts file works" do
     get "/site/ref2_2.js"
-    assert_match /f\(1, 2\);\s*/, last_response.body
+    assert_match /f\(1, 2\);\s*/,
+        source
   end
 
   test "<reference> to multiple .ts files works" do
     get "/site/ref3_1.js"
-    assert_match /var f1 = function \(\) \{\s*\};\s*var f2 = function \(\) \{\s*\};\s*f1\(\);\s*f2\(\);\s*/,
-                 last_response.body
+    assert_match /var f1 = function \(\) \{\s*\};\s*var f2 = function \(\) \{\s*\};\s*f1\(\);\s*f2\(\);/,
+        source
   end
 
 end
