Merge branch 'fix-y2k17-problem' into 'master'

spec/features/projects/files/project_owner_creates_license_file_spec.rb

@@ -25,7 +25,7 @@ feature 'project owner creates a license file', feature: true, js: true do
 
     file_content = find('.file-content')
     expect(file_content).to have_content('The MIT License (MIT)')
-    expect(file_content).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+    expect(file_content).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
 
     fill_in :commit_message, with: 'Add a LICENSE file', visible: true
     click_button 'Commit Changes'
@@ -33,7 +33,7 @@ feature 'project owner creates a license file', feature: true, js: true do
     expect(current_path).to eq(
       namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
     expect(page).to have_content('The MIT License (MIT)')
-    expect(page).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+    expect(page).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
   end
 
   scenario 'project master creates a license file from the "Add license" link' do
@@ -48,7 +48,7 @@ feature 'project owner creates a license file', feature: true, js: true do
 
     file_content = find('.file-content')
     expect(file_content).to have_content('The MIT License (MIT)')
-    expect(file_content).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+    expect(file_content).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
 
     fill_in :commit_message, with: 'Add a LICENSE file', visible: true
     click_button 'Commit Changes'
@@ -56,6 +56,6 @@ feature 'project owner creates a license file', feature: true, js: true do
     expect(current_path).to eq(
       namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
     expect(page).to have_content('The MIT License (MIT)')
-    expect(page).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+    expect(page).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
   end
 end

spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb

@@ -24,7 +24,7 @@ feature 'project owner sees a link to create a license file in empty project', f
 
     file_content = find('.file-content')
     expect(file_content).to have_content('The MIT License (MIT)')
-    expect(file_content).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+    expect(file_content).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
 
     fill_in :commit_message, with: 'Add a LICENSE file', visible: true
     # Remove pre-receive hook so we can push without auth
@@ -34,6 +34,6 @@ feature 'project owner sees a link to create a license file in empty project', f
     expect(current_path).to eq(
       namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
     expect(page).to have_content('The MIT License (MIT)')
-    expect(page).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+    expect(page).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
   end
 end

spec/requests/api/licenses_spec.rb

@@ -57,7 +57,7 @@ describe API::Licenses, api: true  do
         end
 
         it 'replaces placeholder values' do
-          expect(json_response['content']).to include('Copyright (c) 2016 Anton')
+          expect(json_response['content']).to include("Copyright (c) #{Time.now.year} Anton")
         end
       end
 
@@ -70,7 +70,7 @@ describe API::Licenses, api: true  do
 
         it 'replaces placeholder values' do
           expect(json_response['content']).to include('My Awesome Project')
-          expect(json_response['content']).to include('Copyright (C) 2016  Anton')
+          expect(json_response['content']).to include("Copyright (C) #{Time.now.year}  Anton")
         end
       end
 
@@ -83,7 +83,7 @@ describe API::Licenses, api: true  do
 
         it 'replaces placeholder values' do
           expect(json_response['content']).to include('My Awesome Project')
-          expect(json_response['content']).to include('Copyright (C) 2016  Anton')
+          expect(json_response['content']).to include("Copyright (C) #{Time.now.year}  Anton")
         end
       end
 
@@ -96,7 +96,7 @@ describe API::Licenses, api: true  do
 
         it 'replaces placeholder values' do
           expect(json_response['content']).to include('My Awesome Project')
-          expect(json_response['content']).to include('Copyright (C) 2016  Anton')
+          expect(json_response['content']).to include("Copyright (C) #{Time.now.year}  Anton")
         end
       end
 
@@ -108,7 +108,7 @@ describe API::Licenses, api: true  do
         end
 
         it 'replaces placeholder values' do
-          expect(json_response['content']).to include('Copyright 2016 Anton')
+          expect(json_response['content']).to include("Copyright #{Time.now.year} Anton")
         end
       end
 
@@ -128,7 +128,7 @@ describe API::Licenses, api: true  do
         it 'replaces the copyright owner placeholder with the name of the current user' do
           get api('/licenses/mit', user)
 
-          expect(json_response['content']).to include("Copyright (c) 2016 #{user.name}")
+          expect(json_response['content']).to include("Copyright (c) #{Time.now.year} #{user.name}")
         end
       end
     end