Commit c732433d authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rails5-fix-duplicate-gpg-signature' into 'master'

Rails5 fix specs duplicate key value violates unique constraint…

See merge request gitlab-org/gitlab-ce!21119
parents ce2f1ec8 80b77b6d
---
title: Rails5 fix specs duplicate key value violates unique constraint 'index_gpg_signatures_on_commit_sha'
merge_request: 21119
author: Jasper Maes
type: fixed
require 'spec_helper' require 'spec_helper'
describe 'Blob shortcuts' do describe 'Blob shortcuts', :js do
include TreeHelper include TreeHelper
let(:project) { create(:project, :public, :repository) } let(:project) { create(:project, :public, :repository) }
let(:path) { project.repository.ls_files(project.repository.root_ref)[0] } let(:path) { project.repository.ls_files(project.repository.root_ref)[0] }
......
...@@ -210,7 +210,7 @@ describe "User browses files" do ...@@ -210,7 +210,7 @@ describe "User browses files" do
end end
end end
context "when browsing a file content" do context "when browsing a file content", :js do
before do before do
visit(tree_path_root_ref) visit(tree_path_root_ref)
......
require 'spec_helper' require 'spec_helper'
describe 'Projects > Files > User deletes files' do describe 'Projects > Files > User deletes files', :js do
let(:fork_message) do let(:fork_message) do
"You're not allowed to make changes to this project directly. "\ "You're not allowed to make changes to this project directly. "\
"A fork of this project has been created that you can make changes in, so you can submit a merge request." "A fork of this project has been created that you can make changes in, so you can submit a merge request."
......
require 'spec_helper' require 'spec_helper'
describe 'Projects > Files > User edits files' do describe 'Projects > Files > User edits files', :js do
include ProjectForksHelper include ProjectForksHelper
let(:project) { create(:project, :repository, name: 'Shop') } let(:project) { create(:project, :repository, name: 'Shop') }
let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') } let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
......
require 'spec_helper' require 'spec_helper'
describe 'Projects > Files > User replaces files' do describe 'Projects > Files > User replaces files', :js do
include DropzoneHelper include DropzoneHelper
let(:fork_message) do let(:fork_message) do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment