Commit 3c18a4f8 authored by Robert Speicher's avatar Robert Speicher

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

Fix some specs which would have broken in 2017 to not break anymore by using a dynamic year value.

Static year values would have caused the test suite to fail on these in the future, so I replaced 'em.

That's pretty much all there is to this MR.

See merge request !4241
parents 399d5e72 2bf818c4
...@@ -25,7 +25,7 @@ feature 'project owner creates a license file', feature: true, js: true do ...@@ -25,7 +25,7 @@ feature 'project owner creates a license file', feature: true, js: true do
file_content = find('.file-content') file_content = find('.file-content')
expect(file_content).to have_content('The MIT License (MIT)') 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 fill_in :commit_message, with: 'Add a LICENSE file', visible: true
click_button 'Commit Changes' click_button 'Commit Changes'
...@@ -33,7 +33,7 @@ feature 'project owner creates a license file', feature: true, js: true do ...@@ -33,7 +33,7 @@ feature 'project owner creates a license file', feature: true, js: true do
expect(current_path).to eq( expect(current_path).to eq(
namespace_project_blob_path(project.namespace, project, 'master/LICENSE')) namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
expect(page).to have_content('The MIT License (MIT)') 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
scenario 'project master creates a license file from the "Add license" link' do 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 ...@@ -48,7 +48,7 @@ feature 'project owner creates a license file', feature: true, js: true do
file_content = find('.file-content') file_content = find('.file-content')
expect(file_content).to have_content('The MIT License (MIT)') 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 fill_in :commit_message, with: 'Add a LICENSE file', visible: true
click_button 'Commit Changes' click_button 'Commit Changes'
...@@ -56,6 +56,6 @@ feature 'project owner creates a license file', feature: true, js: true do ...@@ -56,6 +56,6 @@ feature 'project owner creates a license file', feature: true, js: true do
expect(current_path).to eq( expect(current_path).to eq(
namespace_project_blob_path(project.namespace, project, 'master/LICENSE')) namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
expect(page).to have_content('The MIT License (MIT)') 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
end end
...@@ -24,7 +24,7 @@ feature 'project owner sees a link to create a license file in empty project', f ...@@ -24,7 +24,7 @@ feature 'project owner sees a link to create a license file in empty project', f
file_content = find('.file-content') file_content = find('.file-content')
expect(file_content).to have_content('The MIT License (MIT)') 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 fill_in :commit_message, with: 'Add a LICENSE file', visible: true
# Remove pre-receive hook so we can push without auth # 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 ...@@ -34,6 +34,6 @@ feature 'project owner sees a link to create a license file in empty project', f
expect(current_path).to eq( expect(current_path).to eq(
namespace_project_blob_path(project.namespace, project, 'master/LICENSE')) namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
expect(page).to have_content('The MIT License (MIT)') 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
end end
...@@ -57,7 +57,7 @@ describe API::Licenses, api: true do ...@@ -57,7 +57,7 @@ describe API::Licenses, api: true do
end end
it 'replaces placeholder values' do 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
end end
...@@ -70,7 +70,7 @@ describe API::Licenses, api: true do ...@@ -70,7 +70,7 @@ describe API::Licenses, api: true do
it 'replaces placeholder values' do it 'replaces placeholder values' do
expect(json_response['content']).to include('My Awesome Project') 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
end end
...@@ -83,7 +83,7 @@ describe API::Licenses, api: true do ...@@ -83,7 +83,7 @@ describe API::Licenses, api: true do
it 'replaces placeholder values' do it 'replaces placeholder values' do
expect(json_response['content']).to include('My Awesome Project') 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
end end
...@@ -96,7 +96,7 @@ describe API::Licenses, api: true do ...@@ -96,7 +96,7 @@ describe API::Licenses, api: true do
it 'replaces placeholder values' do it 'replaces placeholder values' do
expect(json_response['content']).to include('My Awesome Project') 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
end end
...@@ -108,7 +108,7 @@ describe API::Licenses, api: true do ...@@ -108,7 +108,7 @@ describe API::Licenses, api: true do
end end
it 'replaces placeholder values' do 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
end end
...@@ -128,7 +128,7 @@ describe API::Licenses, api: true do ...@@ -128,7 +128,7 @@ describe API::Licenses, api: true do
it 'replaces the copyright owner placeholder with the name of the current user' do it 'replaces the copyright owner placeholder with the name of the current user' do
get api('/licenses/mit', user) 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 end
end end
......
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