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
4dc3f0e7
Commit
4dc3f0e7
authored
Feb 21, 2022
by
Alex Kalderimis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Autocorrect TimeZone offenses
This is the result of running `rubocop -A`.
parent
81a88aaa
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
37 additions
and
37 deletions
+37
-37
ee/spec/features/admin/admin_reset_pipeline_minutes_spec.rb
ee/spec/features/admin/admin_reset_pipeline_minutes_spec.rb
+1
-1
ee/spec/features/groups/iterations/iterations_list_spec.rb
ee/spec/features/groups/iterations/iterations_list_spec.rb
+1
-1
ee/spec/features/groups/iterations/user_creates_iteration_in_cadence_spec.rb
...oups/iterations/user_creates_iteration_in_cadence_spec.rb
+1
-1
ee/spec/features/groups/iterations/user_edits_iteration_spec.rb
...c/features/groups/iterations/user_edits_iteration_spec.rb
+1
-1
ee/spec/features/groups/iterations/user_views_iteration_spec.rb
...c/features/groups/iterations/user_views_iteration_spec.rb
+1
-1
ee/spec/features/projects/iterations/iterations_list_spec.rb
ee/spec/features/projects/iterations/iterations_list_spec.rb
+1
-1
ee/spec/features/projects/iterations/user_views_iteration_spec.rb
...features/projects/iterations/user_views_iteration_spec.rb
+1
-1
ee/spec/features/projects/mirror_spec.rb
ee/spec/features/projects/mirror_spec.rb
+1
-1
spec/features/admin/admin_runners_spec.rb
spec/features/admin/admin_runners_spec.rb
+4
-4
spec/features/admin/admin_users_spec.rb
spec/features/admin/admin_users_spec.rb
+1
-1
spec/features/admin/admin_uses_repository_checks_spec.rb
spec/features/admin/admin_uses_repository_checks_spec.rb
+1
-1
spec/features/admin/users/user_spec.rb
spec/features/admin/users/user_spec.rb
+2
-2
spec/features/admin/users/users_spec.rb
spec/features/admin/users/users_spec.rb
+1
-1
spec/features/dashboard/projects_spec.rb
spec/features/dashboard/projects_spec.rb
+2
-2
spec/features/issues/user_sorts_issues_spec.rb
spec/features/issues/user_sorts_issues_spec.rb
+4
-4
spec/features/projects/blobs/edit_spec.rb
spec/features/projects/blobs/edit_spec.rb
+1
-1
spec/features/projects/files/project_owner_creates_license_file_spec.rb
...projects/files/project_owner_creates_license_file_spec.rb
+4
-4
spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
...sees_link_to_create_license_file_in_empty_project_spec.rb
+2
-2
spec/features/projects/jobs_spec.rb
spec/features/projects/jobs_spec.rb
+2
-2
spec/features/projects/pipelines/pipelines_spec.rb
spec/features/projects/pipelines/pipelines_spec.rb
+1
-1
spec/features/projects/remote_mirror_spec.rb
spec/features/projects/remote_mirror_spec.rb
+1
-1
spec/features/users/login_spec.rb
spec/features/users/login_spec.rb
+2
-2
spec/features/users/show_spec.rb
spec/features/users/show_spec.rb
+1
-1
No files found.
ee/spec/features/admin/admin_reset_pipeline_minutes_spec.rb
View file @
4dc3f0e7
...
@@ -19,7 +19,7 @@ RSpec.describe 'Reset namespace pipeline minutes', :js do
...
@@ -19,7 +19,7 @@ RSpec.describe 'Reset namespace pipeline minutes', :js do
end
end
it
'resets pipeline minutes'
do
it
'resets pipeline minutes'
do
time
=
Time
.
now
time
=
Time
.
zone
.
now
travel_to
(
time
)
do
travel_to
(
time
)
do
click_button
'Reset pipeline minutes'
click_button
'Reset pipeline minutes'
...
...
ee/spec/features/groups/iterations/iterations_list_spec.rb
View file @
4dc3f0e7
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
require
'spec_helper'
require
'spec_helper'
RSpec
.
describe
'Iterations list'
,
:js
do
RSpec
.
describe
'Iterations list'
,
:js
do
let_it_be
(
:now
)
{
Time
.
now
}
let_it_be
(
:now
)
{
Time
.
zone
.
now
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:subgroup
)
{
create
(
:group
,
parent:
group
)
}
let_it_be
(
:subgroup
)
{
create
(
:group
,
parent:
group
)
}
let_it_be
(
:user
)
{
create
(
:user
)
}
let_it_be
(
:user
)
{
create
(
:user
)
}
...
...
ee/spec/features/groups/iterations/user_creates_iteration_in_cadence_spec.rb
View file @
4dc3f0e7
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
require
'spec_helper'
require
'spec_helper'
RSpec
.
describe
'User creates iteration in a cadence'
,
:js
do
RSpec
.
describe
'User creates iteration in a cadence'
,
:js
do
let_it_be
(
:now
)
{
Time
.
now
}
let_it_be
(
:now
)
{
Time
.
zone
.
now
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:user
)
{
create
(
:group_member
,
:maintainer
,
user:
create
(
:user
),
group:
group
).
user
}
let_it_be
(
:user
)
{
create
(
:group_member
,
:maintainer
,
user:
create
(
:user
),
group:
group
).
user
}
let_it_be
(
:cadence
)
{
create
(
:iterations_cadence
,
group:
group
,
automatic:
false
,
duration_in_weeks:
0
)
}
let_it_be
(
:cadence
)
{
create
(
:iterations_cadence
,
group:
group
,
automatic:
false
,
duration_in_weeks:
0
)
}
...
...
ee/spec/features/groups/iterations/user_edits_iteration_spec.rb
View file @
4dc3f0e7
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
require
'spec_helper'
require
'spec_helper'
RSpec
.
describe
'User edits iteration'
do
RSpec
.
describe
'User edits iteration'
do
let_it_be
(
:now
)
{
Time
.
now
}
let_it_be
(
:now
)
{
Time
.
zone
.
now
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:user
)
{
create
(
:group_member
,
:maintainer
,
user:
create
(
:user
),
group:
group
).
user
}
let_it_be
(
:user
)
{
create
(
:group_member
,
:maintainer
,
user:
create
(
:user
),
group:
group
).
user
}
let_it_be
(
:guest_user
)
{
create
(
:group_member
,
:guest
,
user:
create
(
:user
),
group:
group
).
user
}
let_it_be
(
:guest_user
)
{
create
(
:group_member
,
:guest
,
user:
create
(
:user
),
group:
group
).
user
}
...
...
ee/spec/features/groups/iterations/user_views_iteration_spec.rb
View file @
4dc3f0e7
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
require
'spec_helper'
require
'spec_helper'
RSpec
.
describe
'User views iteration'
do
RSpec
.
describe
'User views iteration'
do
let_it_be
(
:now
)
{
Time
.
now
}
let_it_be
(
:now
)
{
Time
.
zone
.
now
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:sub_group
)
{
create
(
:group
,
:private
,
parent:
group
)
}
let_it_be
(
:sub_group
)
{
create
(
:group
,
:private
,
parent:
group
)
}
let_it_be
(
:project
)
{
create
(
:project
,
group:
group
)
}
let_it_be
(
:project
)
{
create
(
:project
,
group:
group
)
}
...
...
ee/spec/features/projects/iterations/iterations_list_spec.rb
View file @
4dc3f0e7
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
require
'spec_helper'
require
'spec_helper'
RSpec
.
describe
'Iterations list'
,
:js
do
RSpec
.
describe
'Iterations list'
,
:js
do
let_it_be
(
:now
)
{
Time
.
now
}
let_it_be
(
:now
)
{
Time
.
zone
.
now
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:project
)
{
create
(
:project
,
:public
,
group:
group
)
}
let_it_be
(
:project
)
{
create
(
:project
,
:public
,
group:
group
)
}
let_it_be
(
:user
)
{
create
(
:user
)
}
let_it_be
(
:user
)
{
create
(
:user
)
}
...
...
ee/spec/features/projects/iterations/user_views_iteration_spec.rb
View file @
4dc3f0e7
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
require
'spec_helper'
require
'spec_helper'
RSpec
.
describe
'User views iteration'
do
RSpec
.
describe
'User views iteration'
do
let_it_be
(
:now
)
{
Time
.
now
}
let_it_be
(
:now
)
{
Time
.
zone
.
now
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:project
)
{
create
(
:project
,
group:
group
)
}
let_it_be
(
:project
)
{
create
(
:project
,
group:
group
)
}
let_it_be
(
:project_2
)
{
create
(
:project
,
group:
group
)
}
let_it_be
(
:project_2
)
{
create
(
:project
,
group:
group
)
}
...
...
ee/spec/features/projects/mirror_spec.rb
View file @
4dc3f0e7
...
@@ -44,7 +44,7 @@ RSpec.describe 'Project mirror', :js do
...
@@ -44,7 +44,7 @@ RSpec.describe 'Project mirror', :js do
end
end
context
'with Update now button'
do
context
'with Update now button'
do
let
(
:timestamp
)
{
Time
.
now
}
let
(
:timestamp
)
{
Time
.
zone
.
now
}
before
do
before
do
import_state
.
update!
(
last_update_at:
6
.
minutes
.
ago
,
next_execution_timestamp:
timestamp
+
10
.
minutes
)
import_state
.
update!
(
last_update_at:
6
.
minutes
.
ago
,
next_execution_timestamp:
timestamp
+
10
.
minutes
)
...
...
spec/features/admin/admin_runners_spec.rb
View file @
4dc3f0e7
...
@@ -21,7 +21,7 @@ RSpec.describe "Admin Runners" do
...
@@ -21,7 +21,7 @@ RSpec.describe "Admin Runners" do
context
"when there are runners"
do
context
"when there are runners"
do
it
'has all necessary texts'
do
it
'has all necessary texts'
do
create
(
:ci_runner
,
:instance
,
created_at:
1
.
year
.
ago
,
contacted_at:
Time
.
now
)
create
(
:ci_runner
,
:instance
,
created_at:
1
.
year
.
ago
,
contacted_at:
Time
.
zone
.
now
)
create
(
:ci_runner
,
:instance
,
created_at:
1
.
year
.
ago
,
contacted_at:
1
.
week
.
ago
)
create
(
:ci_runner
,
:instance
,
created_at:
1
.
year
.
ago
,
contacted_at:
1
.
week
.
ago
)
create
(
:ci_runner
,
:instance
,
created_at:
1
.
year
.
ago
,
contacted_at:
1
.
year
.
ago
)
create
(
:ci_runner
,
:instance
,
created_at:
1
.
year
.
ago
,
contacted_at:
1
.
year
.
ago
)
...
@@ -156,9 +156,9 @@ RSpec.describe "Admin Runners" do
...
@@ -156,9 +156,9 @@ RSpec.describe "Admin Runners" do
let!
(
:never_contacted
)
{
create
(
:ci_runner
,
:instance
,
description:
'runner-never-contacted'
,
contacted_at:
nil
)
}
let!
(
:never_contacted
)
{
create
(
:ci_runner
,
:instance
,
description:
'runner-never-contacted'
,
contacted_at:
nil
)
}
before
do
before
do
create
(
:ci_runner
,
:instance
,
description:
'runner-1'
,
contacted_at:
Time
.
now
)
create
(
:ci_runner
,
:instance
,
description:
'runner-1'
,
contacted_at:
Time
.
zone
.
now
)
create
(
:ci_runner
,
:instance
,
description:
'runner-2'
,
contacted_at:
Time
.
now
)
create
(
:ci_runner
,
:instance
,
description:
'runner-2'
,
contacted_at:
Time
.
zone
.
now
)
create
(
:ci_runner
,
:instance
,
description:
'runner-paused'
,
active:
false
,
contacted_at:
Time
.
now
)
create
(
:ci_runner
,
:instance
,
description:
'runner-paused'
,
active:
false
,
contacted_at:
Time
.
zone
.
now
)
visit
admin_runners_path
visit
admin_runners_path
end
end
...
...
spec/features/admin/admin_users_spec.rb
View file @
4dc3f0e7
...
@@ -54,7 +54,7 @@ RSpec.describe "Admin::Users" do
...
@@ -54,7 +54,7 @@ RSpec.describe "Admin::Users" do
visit
admin_users_path
(
tab:
'cohorts'
)
visit
admin_users_path
(
tab:
'cohorts'
)
expect
(
page
).
to
have_content
(
"
#{
Time
.
now
.
strftime
(
'%b %Y'
)
}
3 0"
)
expect
(
page
).
to
have_content
(
"
#{
Time
.
zone
.
now
.
strftime
(
'%b %Y'
)
}
3 0"
)
end
end
end
end
...
...
spec/features/admin/admin_uses_repository_checks_spec.rb
View file @
4dc3f0e7
...
@@ -43,7 +43,7 @@ RSpec.describe 'Admin uses repository checks', :request_store do
...
@@ -43,7 +43,7 @@ RSpec.describe 'Admin uses repository checks', :request_store do
project
=
create
(
:project
)
project
=
create
(
:project
)
project
.
update_columns
(
project
.
update_columns
(
last_repository_check_failed:
true
,
last_repository_check_failed:
true
,
last_repository_check_at:
Time
.
now
last_repository_check_at:
Time
.
zone
.
now
)
)
visit_admin_project_page
(
project
)
visit_admin_project_page
(
project
)
...
...
spec/features/admin/users/user_spec.rb
View file @
4dc3f0e7
...
@@ -220,7 +220,7 @@ RSpec.describe 'Admin::Users::User' do
...
@@ -220,7 +220,7 @@ RSpec.describe 'Admin::Users::User' do
context
'a user with an expired password'
do
context
'a user with an expired password'
do
before
do
before
do
another_user
.
update!
(
password_expires_at:
Time
.
now
-
5
.
minutes
)
another_user
.
update!
(
password_expires_at:
Time
.
zone
.
now
-
5
.
minutes
)
end
end
it
'does not redirect to password change page'
do
it
'does not redirect to password change page'
do
...
@@ -255,7 +255,7 @@ RSpec.describe 'Admin::Users::User' do
...
@@ -255,7 +255,7 @@ RSpec.describe 'Admin::Users::User' do
context
'a user with an expired password'
do
context
'a user with an expired password'
do
before
do
before
do
another_user
.
update!
(
password_expires_at:
Time
.
now
-
5
.
minutes
)
another_user
.
update!
(
password_expires_at:
Time
.
zone
.
now
-
5
.
minutes
)
end
end
it
'is redirected back to the impersonated users page in the admin after stopping'
do
it
'is redirected back to the impersonated users page in the admin after stopping'
do
...
...
spec/features/admin/users/users_spec.rb
View file @
4dc3f0e7
...
@@ -574,7 +574,7 @@ RSpec.describe 'Admin::Users' do
...
@@ -574,7 +574,7 @@ RSpec.describe 'Admin::Users' do
user
.
reload
user
.
reload
expect
(
user
.
name
).
to
eq
(
'Big Bang'
)
expect
(
user
.
name
).
to
eq
(
'Big Bang'
)
expect
(
user
.
admin?
).
to
be_truthy
expect
(
user
.
admin?
).
to
be_truthy
expect
(
user
.
password_expires_at
).
to
be
<=
Time
.
now
expect
(
user
.
password_expires_at
).
to
be
<=
Time
.
zone
.
now
end
end
end
end
...
...
spec/features/dashboard/projects_spec.rb
View file @
4dc3f0e7
...
@@ -48,7 +48,7 @@ RSpec.describe 'Dashboard Projects' do
...
@@ -48,7 +48,7 @@ RSpec.describe 'Dashboard Projects' do
context
'when last_repository_updated_at, last_activity_at and update_at are present'
do
context
'when last_repository_updated_at, last_activity_at and update_at are present'
do
it
'shows the last_repository_updated_at attribute as the update date'
do
it
'shows the last_repository_updated_at attribute as the update date'
do
project
.
update!
(
last_repository_updated_at:
Time
.
now
,
last_activity_at:
1
.
hour
.
ago
)
project
.
update!
(
last_repository_updated_at:
Time
.
zone
.
now
,
last_activity_at:
1
.
hour
.
ago
)
visit
dashboard_projects_path
visit
dashboard_projects_path
...
@@ -56,7 +56,7 @@ RSpec.describe 'Dashboard Projects' do
...
@@ -56,7 +56,7 @@ RSpec.describe 'Dashboard Projects' do
end
end
it
'shows the last_activity_at attribute as the update date'
do
it
'shows the last_activity_at attribute as the update date'
do
project
.
update!
(
last_repository_updated_at:
1
.
hour
.
ago
,
last_activity_at:
Time
.
now
)
project
.
update!
(
last_repository_updated_at:
1
.
hour
.
ago
,
last_activity_at:
Time
.
zone
.
now
)
visit
dashboard_projects_path
visit
dashboard_projects_path
...
...
spec/features/issues/user_sorts_issues_spec.rb
View file @
4dc3f0e7
...
@@ -9,9 +9,9 @@ RSpec.describe "User sorts issues" do
...
@@ -9,9 +9,9 @@ RSpec.describe "User sorts issues" do
let_it_be
(
:user
)
{
create
(
:user
)
}
let_it_be
(
:user
)
{
create
(
:user
)
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:group
)
{
create
(
:group
)
}
let_it_be
(
:project
)
{
create
(
:project_empty_repo
,
:public
,
group:
group
)
}
let_it_be
(
:project
)
{
create
(
:project_empty_repo
,
:public
,
group:
group
)
}
let_it_be
(
:issue1
,
reload:
true
)
{
create
(
:issue
,
title:
'foo'
,
created_at:
Time
.
now
,
project:
project
)
}
let_it_be
(
:issue1
,
reload:
true
)
{
create
(
:issue
,
title:
'foo'
,
created_at:
Time
.
zone
.
now
,
project:
project
)
}
let_it_be
(
:issue2
,
reload:
true
)
{
create
(
:issue
,
title:
'bar'
,
created_at:
Time
.
now
-
60
,
project:
project
)
}
let_it_be
(
:issue2
,
reload:
true
)
{
create
(
:issue
,
title:
'bar'
,
created_at:
Time
.
zone
.
now
-
60
,
project:
project
)
}
let_it_be
(
:issue3
,
reload:
true
)
{
create
(
:issue
,
title:
'baz'
,
created_at:
Time
.
now
-
120
,
project:
project
)
}
let_it_be
(
:issue3
,
reload:
true
)
{
create
(
:issue
,
title:
'baz'
,
created_at:
Time
.
zone
.
now
-
120
,
project:
project
)
}
let_it_be
(
:newer_due_milestone
)
{
create
(
:milestone
,
project:
project
,
due_date:
'2013-12-11'
)
}
let_it_be
(
:newer_due_milestone
)
{
create
(
:milestone
,
project:
project
,
due_date:
'2013-12-11'
)
}
let_it_be
(
:later_due_milestone
)
{
create
(
:milestone
,
project:
project
,
due_date:
'2013-12-12'
)
}
let_it_be
(
:later_due_milestone
)
{
create
(
:milestone
,
project:
project
,
due_date:
'2013-12-12'
)
}
...
@@ -75,7 +75,7 @@ RSpec.describe "User sorts issues" do
...
@@ -75,7 +75,7 @@ RSpec.describe "User sorts issues" do
end
end
it
'sorts by most recently updated'
,
:js
do
it
'sorts by most recently updated'
,
:js
do
issue3
.
updated_at
=
Time
.
now
+
100
issue3
.
updated_at
=
Time
.
zone
.
now
+
100
issue3
.
save!
issue3
.
save!
visit
project_issues_path
(
project
,
sort:
sort_value_recently_updated
)
visit
project_issues_path
(
project
,
sort:
sort_value_recently_updated
)
...
...
spec/features/projects/blobs/edit_spec.rb
View file @
4dc3f0e7
...
@@ -183,7 +183,7 @@ RSpec.describe 'Editing file blob', :js do
...
@@ -183,7 +183,7 @@ RSpec.describe 'Editing file blob', :js do
freeze_time
do
freeze_time
do
visit
project_edit_blob_path
(
project
,
tree_join
(
protected_branch
,
file_path
))
visit
project_edit_blob_path
(
project
,
tree_join
(
protected_branch
,
file_path
))
epoch
=
Time
.
now
.
strftime
(
'%s%L'
).
last
(
5
)
epoch
=
Time
.
zone
.
now
.
strftime
(
'%s%L'
).
last
(
5
)
expect
(
find
(
'.js-branch-name'
).
value
).
to
eq
"
#{
user
.
username
}
-protected-branch-patch-
#{
epoch
}
"
expect
(
find
(
'.js-branch-name'
).
value
).
to
eq
"
#{
user
.
username
}
-protected-branch-patch-
#{
epoch
}
"
end
end
...
...
spec/features/projects/files/project_owner_creates_license_file_spec.rb
View file @
4dc3f0e7
...
@@ -26,7 +26,7 @@ RSpec.describe 'Projects > Files > Project owner creates a license file', :js do
...
@@ -26,7 +26,7 @@ RSpec.describe 'Projects > Files > Project owner creates a license file', :js do
file_content
=
first
(
'.file-editor'
)
file_content
=
first
(
'.file-editor'
)
expect
(
file_content
).
to
have_content
(
'MIT License'
)
expect
(
file_content
).
to
have_content
(
'MIT License'
)
expect
(
file_content
).
to
have_content
(
"Copyright (c)
#{
Time
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
expect
(
file_content
).
to
have_content
(
"Copyright (c)
#{
Time
.
zone
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
fill_in
:commit_message
,
with:
'Add a LICENSE file'
,
visible:
true
fill_in
:commit_message
,
with:
'Add a LICENSE file'
,
visible:
true
click_button
'Commit changes'
click_button
'Commit changes'
...
@@ -34,7 +34,7 @@ RSpec.describe 'Projects > Files > Project owner creates a license file', :js do
...
@@ -34,7 +34,7 @@ RSpec.describe 'Projects > Files > Project owner creates a license file', :js do
expect
(
current_path
).
to
eq
(
expect
(
current_path
).
to
eq
(
project_blob_path
(
project
,
'master/LICENSE'
))
project_blob_path
(
project
,
'master/LICENSE'
))
expect
(
page
).
to
have_content
(
'MIT License'
)
expect
(
page
).
to
have_content
(
'MIT License'
)
expect
(
page
).
to
have_content
(
"Copyright (c)
#{
Time
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
expect
(
page
).
to
have_content
(
"Copyright (c)
#{
Time
.
zone
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
end
end
it
'project maintainer creates a license file from the "Add license" link'
do
it
'project maintainer creates a license file from the "Add license" link'
do
...
@@ -50,7 +50,7 @@ RSpec.describe 'Projects > Files > Project owner creates a license file', :js do
...
@@ -50,7 +50,7 @@ RSpec.describe 'Projects > Files > Project owner creates a license file', :js do
file_content
=
first
(
'.file-editor'
)
file_content
=
first
(
'.file-editor'
)
expect
(
file_content
).
to
have_content
(
'MIT License'
)
expect
(
file_content
).
to
have_content
(
'MIT License'
)
expect
(
file_content
).
to
have_content
(
"Copyright (c)
#{
Time
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
expect
(
file_content
).
to
have_content
(
"Copyright (c)
#{
Time
.
zone
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
fill_in
:commit_message
,
with:
'Add a LICENSE file'
,
visible:
true
fill_in
:commit_message
,
with:
'Add a LICENSE file'
,
visible:
true
click_button
'Commit changes'
click_button
'Commit changes'
...
@@ -58,7 +58,7 @@ RSpec.describe 'Projects > Files > Project owner creates a license file', :js do
...
@@ -58,7 +58,7 @@ RSpec.describe 'Projects > Files > Project owner creates a license file', :js do
expect
(
current_path
).
to
eq
(
expect
(
current_path
).
to
eq
(
project_blob_path
(
project
,
'master/LICENSE'
))
project_blob_path
(
project
,
'master/LICENSE'
))
expect
(
page
).
to
have_content
(
'MIT License'
)
expect
(
page
).
to
have_content
(
'MIT License'
)
expect
(
page
).
to
have_content
(
"Copyright (c)
#{
Time
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
expect
(
page
).
to
have_content
(
"Copyright (c)
#{
Time
.
zone
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
end
end
def
select_template
(
template
)
def
select_template
(
template
)
...
...
spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
View file @
4dc3f0e7
...
@@ -23,7 +23,7 @@ RSpec.describe 'Projects > Files > Project owner sees a link to create a license
...
@@ -23,7 +23,7 @@ RSpec.describe 'Projects > Files > Project owner sees a link to create a license
select_template
(
'MIT License'
)
select_template
(
'MIT License'
)
expect
(
ide_editor_value
).
to
have_content
(
'MIT License'
)
expect
(
ide_editor_value
).
to
have_content
(
'MIT License'
)
expect
(
ide_editor_value
).
to
have_content
(
"Copyright (c)
#{
Time
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
expect
(
ide_editor_value
).
to
have_content
(
"Copyright (c)
#{
Time
.
zone
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
ide_commit
ide_commit
...
@@ -33,7 +33,7 @@ RSpec.describe 'Projects > Files > Project owner sees a link to create a license
...
@@ -33,7 +33,7 @@ RSpec.describe 'Projects > Files > Project owner sees a link to create a license
license_file
=
project
.
repository
.
blob_at
(
'master'
,
'LICENSE'
).
data
license_file
=
project
.
repository
.
blob_at
(
'master'
,
'LICENSE'
).
data
expect
(
license_file
).
to
have_content
(
'MIT License'
)
expect
(
license_file
).
to
have_content
(
'MIT License'
)
expect
(
license_file
).
to
have_content
(
"Copyright (c)
#{
Time
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
expect
(
license_file
).
to
have_content
(
"Copyright (c)
#{
Time
.
zone
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
end
end
def
select_template
(
template
)
def
select_template
(
template
)
...
...
spec/features/projects/jobs_spec.rb
View file @
4dc3f0e7
...
@@ -384,7 +384,7 @@ RSpec.describe 'Jobs', :clean_gitlab_redis_shared_state do
...
@@ -384,7 +384,7 @@ RSpec.describe 'Jobs', :clean_gitlab_redis_shared_state do
end
end
context
'when expire date is defined'
do
context
'when expire date is defined'
do
let
(
:expire_at
)
{
Time
.
now
+
7
.
days
}
let
(
:expire_at
)
{
Time
.
zone
.
now
+
7
.
days
}
context
'when user has ability to update job'
do
context
'when user has ability to update job'
do
context
'when artifacts are unlocked'
do
context
'when artifacts are unlocked'
do
...
@@ -423,7 +423,7 @@ RSpec.describe 'Jobs', :clean_gitlab_redis_shared_state do
...
@@ -423,7 +423,7 @@ RSpec.describe 'Jobs', :clean_gitlab_redis_shared_state do
end
end
context
'when artifacts expired'
do
context
'when artifacts expired'
do
let
(
:expire_at
)
{
Time
.
now
-
7
.
days
}
let
(
:expire_at
)
{
Time
.
zone
.
now
-
7
.
days
}
context
'when artifacts are unlocked'
do
context
'when artifacts are unlocked'
do
before
do
before
do
...
...
spec/features/projects/pipelines/pipelines_spec.rb
View file @
4dc3f0e7
...
@@ -414,7 +414,7 @@ RSpec.describe 'Pipelines', :js do
...
@@ -414,7 +414,7 @@ RSpec.describe 'Pipelines', :js do
it
"has link to the delayed job's action"
do
it
"has link to the delayed job's action"
do
find
(
'[data-testid="pipelines-manual-actions-dropdown"]'
).
click
find
(
'[data-testid="pipelines-manual-actions-dropdown"]'
).
click
time_diff
=
[
0
,
delayed_job
.
scheduled_at
-
Time
.
now
].
max
time_diff
=
[
0
,
delayed_job
.
scheduled_at
-
Time
.
zone
.
now
].
max
expect
(
page
).
to
have_button
(
'delayed job 1'
)
expect
(
page
).
to
have_button
(
'delayed job 1'
)
expect
(
page
).
to
have_content
(
Time
.
at
(
time_diff
).
utc
.
strftime
(
"%H:%M:%S"
))
expect
(
page
).
to
have_content
(
Time
.
at
(
time_diff
).
utc
.
strftime
(
"%H:%M:%S"
))
end
end
...
...
spec/features/projects/remote_mirror_spec.rb
View file @
4dc3f0e7
...
@@ -25,7 +25,7 @@ RSpec.describe 'Project remote mirror', :feature do
...
@@ -25,7 +25,7 @@ RSpec.describe 'Project remote mirror', :feature do
context
'when last_error and last_update_at are present'
do
context
'when last_error and last_update_at are present'
do
it
'renders error message with timestamp'
do
it
'renders error message with timestamp'
do
remote_mirror
.
update!
(
last_error:
'Some new error'
,
last_update_at:
Time
.
now
-
5
.
minutes
)
remote_mirror
.
update!
(
last_error:
'Some new error'
,
last_update_at:
Time
.
zone
.
now
-
5
.
minutes
)
visit
project_mirror_path
(
project
)
visit
project_mirror_path
(
project
)
...
...
spec/features/users/login_spec.rb
View file @
4dc3f0e7
...
@@ -437,7 +437,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
...
@@ -437,7 +437,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
context
'when the users password is expired'
do
context
'when the users password is expired'
do
before
do
before
do
user
.
update!
(
password_expires_at:
Time
.
parse
(
'2018-05-08 11:29:46 UTC'
))
user
.
update!
(
password_expires_at:
Time
.
zone
.
parse
(
'2018-05-08 11:29:46 UTC'
))
end
end
it
'asks for a new password'
do
it
'asks for a new password'
do
...
@@ -860,7 +860,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
...
@@ -860,7 +860,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
context
'when the users password is expired'
do
context
'when the users password is expired'
do
before
do
before
do
user
.
update!
(
password_expires_at:
Time
.
parse
(
'2018-05-08 11:29:46 UTC'
))
user
.
update!
(
password_expires_at:
Time
.
zone
.
parse
(
'2018-05-08 11:29:46 UTC'
))
end
end
it
'asks the user to accept the terms before setting a new password'
do
it
'asks the user to accept the terms before setting a new password'
do
...
...
spec/features/users/show_spec.rb
View file @
4dc3f0e7
...
@@ -426,7 +426,7 @@ RSpec.describe 'User page' do
...
@@ -426,7 +426,7 @@ RSpec.describe 'User page' do
end
end
context
'structured markup'
do
context
'structured markup'
do
let_it_be
(
:user
)
{
create
(
:user
,
website_url:
'https://gitlab.com'
,
organization:
'GitLab'
,
job_title:
'Frontend Engineer'
,
email:
'public@example.com'
,
public_email:
'public@example.com'
,
location:
'Country'
,
created_at:
Time
.
now
,
updated_at:
Tim
e
.
now
)
}
let_it_be
(
:user
)
{
create
(
:user
,
website_url:
'https://gitlab.com'
,
organization:
'GitLab'
,
job_title:
'Frontend Engineer'
,
email:
'public@example.com'
,
public_email:
'public@example.com'
,
location:
'Country'
,
created_at:
Time
.
zone
.
now
,
updated_at:
Time
.
zon
e
.
now
)
}
it
'shows Person structured markup'
do
it
'shows Person structured markup'
do
subject
subject
...
...
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