summaryrefslogtreecommitdiff
path: root/spec/controllers/application_controller_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-18 11:18:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-18 11:18:50 +0000
commit8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch)
treea77e7fe7a93de11213032ed4ab1f33a3db51b738 /spec/controllers/application_controller_spec.rb
parent00b35af3db1abfe813a778f643dad221aad51fca (diff)
downloadgitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'spec/controllers/application_controller_spec.rb')
-rw-r--r--spec/controllers/application_controller_spec.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index ed2e61d6cf6..4002b7aca63 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
require 'spec_helper'
-describe ApplicationController do
+RSpec.describe ApplicationController do
include TermsHelper
let(:user) { create(:user) }
@@ -310,13 +310,6 @@ describe ApplicationController do
expect(subject).to be_truthy
end
-
- it 'returns true if user has signed up using omniauth-ultraauth' do
- user = create(:omniauth_user, provider: 'ultraauth')
- allow(controller).to receive(:current_user).and_return(user)
-
- expect(subject).to be_truthy
- end
end
describe '#two_factor_grace_period' do