Commit 99fdbe4c authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rails5-fix-47960' into 'master'

Rails5 fix update_attribute usage not causing a save

Closes #47960

See merge request gitlab-org/gitlab-ce!19881
parents b7700e09 f1955962
---
title: Rails5 fix update_attribute usage not causing a save
merge_request: 19881
author: Jasper Maes
type: fixed
......@@ -29,7 +29,7 @@ describe Projects::ImportsController do
context 'when import is in progress' do
before do
project.update_attribute(:import_status, :started)
project.update_attributes(import_status: :started)
end
it 'renders template' do
......@@ -47,7 +47,7 @@ describe Projects::ImportsController do
context 'when import failed' do
before do
project.update_attribute(:import_status, :failed)
project.update_attributes(import_status: :failed)
end
it 'redirects to new_namespace_project_import_path' do
......@@ -59,7 +59,7 @@ describe Projects::ImportsController do
context 'when import finished' do
before do
project.update_attribute(:import_status, :finished)
project.update_attributes(import_status: :finished)
end
context 'when project is a fork' do
......@@ -108,7 +108,7 @@ describe Projects::ImportsController do
context 'when import never happened' do
before do
project.update_attribute(:import_status, :none)
project.update_attributes(import_status: :none)
end
it 'redirects to namespace_project_path' 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