diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-24 19:10:50 -0500 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-24 19:10:50 -0500 |
commit | b2dcfc4db3828888f9aa0a9cc38e89fe84d30b2c (patch) | |
tree | 82c57e0744f87e51c5ea4875105445419b0781cc /features | |
parent | b9156669fef4fd96862a5caf720e4820c43325ab (diff) | |
parent | b95ef77e233eab3b3d37a4a7dce545d9da36f8a0 (diff) | |
download | gitlab-ce-b2dcfc4db3828888f9aa0a9cc38e89fe84d30b2c.tar.gz |
Merge branch 'rs-crowd-form-view-spec' into avatar-cropping
Diffstat (limited to 'features')
-rw-r--r-- | features/login_form.feature | 11 | ||||
-rw-r--r-- | features/steps/login_form.rb | 25 |
2 files changed, 0 insertions, 36 deletions
diff --git a/features/login_form.feature b/features/login_form.feature deleted file mode 100644 index 7965882f7fc..00000000000 --- a/features/login_form.feature +++ /dev/null @@ -1,11 +0,0 @@ -Feature: Login form - Scenario: I see Crowd form - Given Crowd integration enabled - When I visit sign in page - Then I should see Crowd login form - - Scenario: I see Crowd form when sign-in is disabled - Given Crowd integration enabled - And Sign-in is disabled - When I visit sign in page - Then I should see Crowd login form diff --git a/features/steps/login_form.rb b/features/steps/login_form.rb deleted file mode 100644 index 90ab10e6229..00000000000 --- a/features/steps/login_form.rb +++ /dev/null @@ -1,25 +0,0 @@ -class Spinach::Features::LoginForm < Spinach::FeatureSteps - include SharedAuthentication - include SharedPaths - include SharedSnippet - include SharedUser - include SharedSearch - - step 'Sign-in is disabled' do - allow_any_instance_of(ApplicationHelper).to receive(:signin_enabled?).and_return(false) - end - - step 'Crowd integration enabled' do - expect(Gitlab::OAuth::Provider).to receive(:providers).and_return([:crowd]) - expect(Gitlab.config.omniauth).to receive(:enabled).and_return(true) - allow_any_instance_of(ApplicationHelper).to receive(:user_omniauth_authorize_path).and_return(root_path) - end - - step 'I should see Crowd login form' do - expect(page).to have_selector '#tab-crowd form' - end - - step 'I visit sign in page' do - visit new_user_session_path - end -end |