Merge branch 'crowd' into 'master'

Crowd integration

https://dev.gitlab.org/gitlab/gitlabhq/issues/2217

See merge request !1228

2 files changed, 30 insertions, 0 deletions

diff --git a/features/login_form.feature b/features/login_form.feature
new file mode 100644
index 00000000000..b4d95754482
--- /dev/null
+++ b/features/login_form.feature
@@ -0,0 +1,5 @@
+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
\ No newline at end of file
diff --git a/features/steps/login_form.rb b/features/steps/login_form.rb
new file mode 100644
index 00000000000..b9ff6ae67fd
--- /dev/null
+++ b/features/steps/login_form.rb
@@ -0,0 +1,25 @@
+class Spinach::Features::LoginForm < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedPaths
+  include SharedSnippet
+  include SharedUser
+  include SharedSearch
+
+  step 'Crowd integration enabled' do
+    @providers_orig = Gitlab::OAuth::Provider.providers
+    @omniauth_conf_orig = Gitlab.config.omniauth.enabled
+    expect(Gitlab::OAuth::Provider).to receive(:providers).and_return([:crowd])
+    allow_any_instance_of(ApplicationHelper).to receive(:user_omniauth_authorize_path).and_return(root_path)
+    expect(Gitlab.config.omniauth).to receive(:enabled).and_return(true)
+  end
+
+  step 'I should see Crowd login form' do
+    expect(page).to have_selector '#tab-crowd form'
+    Gitlab::OAuth::Provider.stub(:providers).and_return(@providers_orig)
+    Gitlab.config.omniauth.stub(:enabled).and_return(@omniauth_conf_orig)
+  end
+
+  step 'I visit sign in page' do
+    visit new_user_session_path
+  end
+end