diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-05-02 16:35:04 +0300 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-05-04 18:33:26 +0300 |
| commit | bddbcaefc2389e4c61763472cecbea150f10cd75 (patch) | |
| tree | 38ba599beed53505dfca09fce7a890bf3b125bb3 /spec/views | |
| parent | 7603beffc916d06039cac63b223d8e6234b5d666 (diff) | |
Backports every CE related change from ee-44542 to CE
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/projects/imports/new.html.haml_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/views/projects/imports/new.html.haml_spec.rb b/spec/views/projects/imports/new.html.haml_spec.rb index ec435ec3b32..32d73d0c5ab 100644 --- a/spec/views/projects/imports/new.html.haml_spec.rb +++ b/spec/views/projects/imports/new.html.haml_spec.rb @@ -4,9 +4,10 @@ describe "projects/imports/new.html.haml" do let(:user) { create(:user) } context 'when import fails' do - let(:project) { create(:project_empty_repo, import_status: :failed, import_error: '<a href="http://googl.com">Foo</a>', import_type: :gitlab_project, import_source: '/var/opt/gitlab/gitlab-rails/shared/tmp/project_exports/uploads/t.tar.gz', import_url: nil) } + let(:project) { create(:project_empty_repo, :import_failed, import_type: :gitlab_project, import_source: '/var/opt/gitlab/gitlab-rails/shared/tmp/project_exports/uploads/t.tar.gz', import_url: nil) } before do + project.import_state.update_attributes(last_error: '<a href="http://googl.com">Foo</a>') sign_in(user) project.add_master(user) end |