diff options
author | Marin Jankovski <marin@gitlab.com> | 2014-07-07 09:32:12 +0200 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2014-07-11 19:53:10 +0200 |
commit | 55efb2d9f2f3024137cfd28ec0b58c723f044b42 (patch) | |
tree | 164a77a84c8a98ee1c958a5732c3a18b0e025f04 /features | |
parent | f3b0cb77fcb379107cdd4f770fdb16381cda1baf (diff) | |
download | gitlab-ce-55efb2d9f2f3024137cfd28ec0b58c723f044b42.tar.gz |
Revert "Merge branch 'redirect_after_login' into 'master'"
This reverts commit 5aaa35656edaf309354528e197a54461f584ed21, reversing
changes made to 5b8c1767676b94f58558e6de320965c68b57de42.
Diffstat (limited to 'features')
-rw-r--r-- | features/project/redirects.feature | 7 | ||||
-rw-r--r-- | features/steps/project/redirects.rb | 22 |
2 files changed, 0 insertions, 29 deletions
diff --git a/features/project/redirects.feature b/features/project/redirects.feature index 776ab83a876..ce197912f64 100644 --- a/features/project/redirects.feature +++ b/features/project/redirects.feature @@ -24,10 +24,3 @@ Feature: Project Redirects Given I sign in as a user When I visit project "Enterprise" page Then page status code should be 404 - - Scenario: I visit a public project without signing in - When I visit project "Community" page - And I should see project "Community" home page - And I click on "Sign In" - And Authenticate - Then I should be redirected to "Community" page diff --git a/features/steps/project/redirects.rb b/features/steps/project/redirects.rb index 5a4342dba30..cfa4ce82be3 100644 --- a/features/steps/project/redirects.rb +++ b/features/steps/project/redirects.rb @@ -31,27 +31,5 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps project = Project.find_by(name: 'Community') visit project_path(project) + 'DoesNotExist' end - - step 'I click on "Sign In"' do - within '.pull-right' do - click_link "Sign in" - end - end - - step 'Authenticate' do - admin = create(:admin) - project = Project.find_by(name: 'Community') - find(:xpath, "//input[@id='return_to']").set "/#{project.path_with_namespace}" - fill_in "user_login", with: admin.email - fill_in "user_password", with: admin.password - click_button "Sign in" - Thread.current[:current_user] = admin - end - - step 'I should be redirected to "Community" page' do - project = Project.find_by(name: 'Community') - page.current_path.should == "/#{project.path_with_namespace}" - page.status_code.should == 200 - end end |