Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c121775c
Commit
c121775c
authored
Jun 08, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/audit-logs-flaky-spec' into 'master'
Fix audit logs spec failing on master See merge request !2069
parents
7390772c
a5af32ed
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
spec/features/admin/admin_audit_logs_spec.rb
spec/features/admin/admin_audit_logs_spec.rb
+1
-2
No files found.
spec/features/admin/admin_audit_logs_spec.rb
View file @
c121775c
...
@@ -56,11 +56,10 @@ describe 'Admin::AuditLogs', feature: true, js: true do
...
@@ -56,11 +56,10 @@ describe 'Admin::AuditLogs', feature: true, js: true do
end
end
describe
'project events'
do
describe
'project events'
do
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:project_member
)
{
create
(
:project_member
,
user:
user
)
}
let
(
:project_member
)
{
create
(
:project_member
,
user:
user
)
}
before
do
before
do
AuditEventService
.
new
(
user
,
project
,
{
action: :destroy
}).
AuditEventService
.
new
(
user
,
project
_member
.
project
,
{
action: :destroy
}).
for_member
(
project_member
).
security_event
for_member
(
project_member
).
security_event
visit
admin_audit_logs_path
visit
admin_audit_logs_path
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment