github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 02:04:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'github-auth' of git://github.com/nverba/discourse

Browse Source 
Conflicts:
	config/locales/server.en.yml
	db/structure.sql
	spec/views/omniauth_callbacks/complete.html.erb_spec.rb
This commit is contained in:
Robin Ward
2013-02-27 12:09:22 -05:00
parent 2184763d4a b45f872c04
commit 007118b00c
18 changed files with 183 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spec/views/omniauth_callbacks/complete.html.erb_spec.rb
View File

@ -38,6 +38,18 @@ describe "users/omniauth_callbacks/complete.html.erb" do
rendered_data["awaiting_activation"].should eq(true)
end
it "renders github data " do
assign(:data, {:username =>"username", :auth_provider=>"Github", :awaiting_activation=>true})
render
rendered_data = JSON.parse(rendered.match(/window.opener.Discourse.authenticationComplete\((.*)\)/)[1])
rendered_data["username"].should eq("username")
rendered_data["auth_provider"].should eq("Github")
rendered_data["awaiting_activation"].should eq(true)
end
end