Download as
Browse Code »

Commit e14ae6ae4378ad269afa3221be2be6a1572efbfe

Authored by Rafael Manzo
Committed by Eduardo Silva Araújo
1 parent 472d9047
Exists in colab

[Colab] OmniAuth (colab) feature fixed 

Signed off by: Daniel Miranda <danielkza2@gmail.com>
Showing 3 changed files with 13 additions and 10 deletions   Show diff stats
db/schema.rb
  Diff comments   View file @e14ae6a
... ... @@ -68,6 +68,6 @@ ActiveRecord::Schema.define(version: 20160418192431) do
68 68  
69 69 add_index "users", ["email"], name: "index_users_on_email", unique: true
70 70 add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
71   - add_index "users", ["uid", "provider"], name: "index_users_on_uid_and_provider", unique: true, using: :btree
  71 + add_index "users", ["uid", "provider"], name: "index_users_on_uid_and_provider", unique: true
72 72  
73 73 end
... ...
features/step_definitions/user_steps.rb
  Diff comments   View file @e14ae6a
... ... @@ -34,20 +34,20 @@ end
34 34  
35 35 Given(/^I am logged in as a Colab user$/) do
36 36 colab_user = FactoryGirl.build(:colab_user)
37   - first_name, last_name = colab_user.name.partition(' ')
38 37  
39   - set_header('HTTP_REMOTE_USER', colab_user.uid)
40   - set_header('HTTP_REMOTE_USER_DATA', {
  38 + set_header('Remote-User', colab_user.uid)
  39 + set_header('Remote-User-Data', {
41 40 'nickname': colab_user.uid,
42 41 'name': colab_user.name,
43   - 'firstname': first_name,
44   - 'lastname': last_name,
45 42 'email': colab_user.email
46 43 }.to_json)
  44 +
  45 + visit(user_omniauth_authorize_path(provider: 'RemoteUser')) # Authenticate the user (remove this if you want just to set the headers)
47 46 end
48 47  
49 48 Then(/^I should be at the Home page$/) do
50   - expect(current_path).to be("/")
  49 + expect(page).to have_content("Understanding Code Metrics") # This ensures that capybara waits all the redirects to get finished before trying to check the URL
  50 + expect(current_path).to eq(root_path(locale: I18n.locale))
51 51 end
52 52  
53 53 Then(/^I should be logged in$/) do
... ...
features/users/omniauth.feature
  Diff comments   View file @e14ae6a
... ... @@ -3,10 +3,13 @@ Feature: Omniauth authentication
3 3 As a regular user
4 4 I want to authenticate with an external provider
5 5  
  6 + #FIXME: For some reason. just for cucumber tests, if you set the HTTP headers, it ignores all the path you visit and goes straight to the omniauth controller action
  7 + @javascript
6 8 Scenario: through Colab
7 9 Given I am logged in as a Colab user
8   - And I am at the homepage
9   - And I click the Sign In link
10   - When I click the Sign in with Remote User link
  10 + #And I am at the homepage
  11 + #And I take a picture of the page
  12 + #And I click the Sign In link
  13 + #When I click the Sign in with Remote User link
11 14 Then I should be at the Home page
12 15 And I should be logged in
13 16 \ No newline at end of file
... ...