Merge branch 'fix-u2f-fixtures' into 26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task

* fix-u2f-fixtures:
  generate u2f frontend fixtures dynamically
  force utf-8 encoding for prior to fixture parsing to prevent nokogiri issues
  exclude script type=text/template from dom scrubbing

1 files changed, 28 insertions, 20 deletions

diff --git a/spec/javascripts/fixtures/u2f.rb b/spec/javascripts/fixtures/u2f.rb
index 076c38ec4b1..c9c0b891237 100644
--- a/spec/javascripts/fixtures/u2f.rb
+++ b/spec/javascripts/fixtures/u2f.rb
@@ -1,35 +1,43 @@
 require 'spec_helper'
 
-describe SessionsController, '(JavaScript fixtures)', type: :controller do
+context 'U2F' do
   include JavaScriptFixturesHelpers
 
+  let(:user) { create(:user, :two_factor_via_u2f) }
+
   before(:all) do
     clean_frontend_fixtures('u2f/')
   end
 
-  it 'u2f/authenticate.html.raw' do |example|
-    fixture = render_template('u2f/_authenticate.html.haml', locals: {
-      new_user_session_path: "/users/sign_in",
-      params: {},
-      resource_name: "user"
-    })
-    store_frontend_fixture(fixture, example.description)
-  end
+  describe SessionsController, '(JavaScript fixtures)', type: :controller do
+    render_views
+
+    before do
+      @request.env['devise.mapping'] = Devise.mappings[:user]
+    end
 
-  it 'u2f/register.html.raw' do |example|
-    user = build(:user, :two_factor_via_otp)
+    it 'u2f/authenticate.html.raw' do |example|
+      allow(controller).to receive(:find_user).and_return(user)
 
-    fixture = render_template('u2f/_register.html.haml', locals: {
-      create_u2f_profile_two_factor_auth_path: '/profile/two_factor_auth/create_u2f',
-      current_user: user
-    })
-    store_frontend_fixture(fixture, example.description)
+      post :create, user: { login: user.username, password: user.password }
+
+      expect(response).to be_success
+      store_frontend_fixture(response, example.description)
+    end
   end
 
-  private
+  describe Profiles::TwoFactorAuthsController, '(JavaScript fixtures)', type: :controller do
+    render_views
+
+    before do
+      sign_in(user)
+    end
+
+    it 'u2f/register.html.raw' do |example|
+      get :show
 
-  def render_template(template, **args)
-    controller = ApplicationController.new
-    controller.render_to_string(template: template, layout: false, **args)
+      expect(response).to be_success
+      store_frontend_fixture(response, example.description)
+    end
   end
 end