Rails 4 updates

spec/controllers/static_controller_spec.rb

@@ -13,7 +13,11 @@ describe StaticController do
     end
 
     it "renders the file" do
-      response.should render_template('faq')
+      if rails4?
+        response.should render_template('static/faq.en')
+      else
+        response.should render_template('faq')
+      end
     end
   end
 
@@ -23,7 +27,11 @@ describe StaticController do
 
       context "when #{setting_name} site setting is NOT set" do
         it "renders the #{id} page" do
-          expect(subject).to render_template(id)
+          if rails4?
+            expect(subject).to render_template("static/#{id}.en")
+          else
+            expect(subject).to render_template(id)
+          end
         end
       end