File tree 4 files changed +41
-10
lines changed
4 files changed +41
-10
lines changed Original file line number Diff line number Diff line change 40
40
end
41
41
42
42
it "does not redirect when user is authenticated" do
43
- user = create ( :user )
43
+ login_as ( create ( :user ) )
44
44
45
- get ( "/news" , { } , "rack.session" => { user_id : user . id } )
45
+ get ( "/news" )
46
46
47
47
expect ( last_response ) . not_to be_redirect
48
48
end
49
49
50
50
it "redirects '/' to '/news'" do
51
- user = create ( :user )
51
+ login_as ( create ( :user ) )
52
52
53
- get ( "/" , { } , "rack.session" => { user_id : user . id } )
53
+ get ( "/" )
54
54
55
55
expect ( last_response ) . to be_redirect
56
56
expect ( last_response . headers [ "Location" ] ) . to end_with ( "/news" )
Original file line number Diff line number Diff line change 41
41
user = create ( :user )
42
42
43
43
params = { password : user . password }
44
- post "/login" , params , "rack.session" => { redirect_to : "/archive" }
44
+ session [ :redirect_to ] = "/archive"
45
+ post "/login" , params
45
46
46
47
expect ( URI . parse ( last_response . location ) . path ) . to eq ( "/archive" )
47
48
end
48
49
end
49
50
50
51
describe "#destroy" do
51
52
it "clears the session" do
52
- get "/logout" , { } , "rack.session" => { userid : 1 }
53
+ session [ :user_id ] = 1
54
+ get "/logout"
53
55
54
56
expect ( session [ :user_id ] ) . to be_nil
55
57
end
56
58
57
59
it "redirects to the root page" do
58
- get "/logout" , { } , "rack.session" => { userid : 1 }
60
+ session [ :user_id ] = 1
61
+ get "/logout"
59
62
60
63
expect ( URI . parse ( last_response . location ) . path ) . to eq ( "/" )
61
64
end
Original file line number Diff line number Diff line change 10
10
let ( :feeds ) { [ instance_double ( Feed ) , instance_double ( Feed ) ] }
11
11
12
12
it "displays the tutorial and completes setup" do
13
- user = create ( :user )
13
+ login_as ( create ( :user ) )
14
14
15
- get "/setup/tutorial" , { } , { "rack.session" => { user_id : user . id } }
15
+ get "/setup/tutorial"
16
16
17
17
page = last_response . body
18
18
expect ( page ) . to have_tag ( "#mark-all-instruction" )
Original file line number Diff line number Diff line change 7
7
Stringer
8
8
end
9
9
10
+ alias old_get get
11
+ def get ( path , params = { } , env = { } )
12
+ old_get ( path , params , env . merge ( "rack.session" => session ) )
13
+ @session = last_request . env [ "rack.session" ]
14
+ end
15
+
16
+ alias old_post post
17
+ def post ( path , params = { } , env = { } )
18
+ old_post ( path , params , env . merge ( "rack.session" => session ) )
19
+ @session = last_request . env [ "rack.session" ]
20
+ end
21
+
22
+ alias old_put put
23
+ def put ( path , params = { } , env = { } )
24
+ old_put ( path , params , env . merge ( "rack.session" => session ) )
25
+ @session = last_request . env [ "rack.session" ]
26
+ end
27
+
28
+ alias old_delete delete
29
+ def delete ( path , params = { } , env = { } )
30
+ old_delete ( path , params , env . merge ( "rack.session" => session ) )
31
+ @session = last_request . env [ "rack.session" ]
32
+ end
33
+
34
+ def login_as ( user )
35
+ session [ :user_id ] = user . id
36
+ end
37
+
10
38
def session
11
- last_request . env [ "rack. session" ]
39
+ @ session ||= { }
12
40
end
13
41
end
You can’t perform that action at this time.
0 commit comments