Merge branch 'master' into 'id-test-codeowners'id-test-codeowners

# Conflicts:
#   .gitlab/CODEOWNERS

1 files changed, 33 insertions, 0 deletions

diff --git a/spec/frontend/fixtures/commit.rb b/spec/frontend/fixtures/commit.rb
new file mode 100644
index 00000000000..a328c455356
--- /dev/null
+++ b/spec/frontend/fixtures/commit.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Projects::CommitController, '(JavaScript fixtures)', type: :controller do
+  include JavaScriptFixturesHelpers
+
+  set(:project)  { create(:project, :repository) }
+  set(:user)     { create(:user) }
+  let(:commit)   { project.commit("master") }
+
+  render_views
+
+  before(:all) do
+    clean_frontend_fixtures('commit/')
+  end
+
+  before do
+    project.add_maintainer(user)
+    sign_in(user)
+    allow(SecureRandom).to receive(:hex).and_return('securerandomhex:thereisnospoon')
+  end
+
+  it 'commit/show.html' do
+    params = {
+      namespace_id: project.namespace,
+      project_id: project,
+      id: commit.id
+    }
+
+    get :show, params: params
+
+    expect(response).to be_successful
+  end
+end