Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
dcca64a5
Commit
dcca64a5
authored
Dec 27, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use `assign` instead of `instance_variable_set`
parent
a7756a4b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
spec/helpers/page_layout_helper_spec.rb
spec/helpers/page_layout_helper_spec.rb
+7
-7
No files found.
spec/helpers/page_layout_helper_spec.rb
View file @
dcca64a5
...
@@ -45,14 +45,14 @@ describe PageLayoutHelper do
...
@@ -45,14 +45,14 @@ describe PageLayoutHelper do
describe
'page_description_default'
do
describe
'page_description_default'
do
it
'uses Project description when available'
do
it
'uses Project description when available'
do
project
=
double
(
description:
'Project Description'
)
project
=
double
(
description:
'Project Description'
)
helper
.
instance_variable_set
(
:@
project
,
project
)
assign
(
:
project
,
project
)
expect
(
helper
.
page_description_default
).
to
eq
'Project Description'
expect
(
helper
.
page_description_default
).
to
eq
'Project Description'
end
end
it
'uses brand_title when Project description is nil'
do
it
'uses brand_title when Project description is nil'
do
project
=
double
(
description:
nil
)
project
=
double
(
description:
nil
)
helper
.
instance_variable_set
(
:@
project
,
project
)
assign
(
:
project
,
project
)
expect
(
helper
).
to
receive
(
:brand_title
).
and_return
(
'Brand Title'
)
expect
(
helper
).
to
receive
(
:brand_title
).
and_return
(
'Brand Title'
)
expect
(
helper
.
page_description_default
).
to
eq
'Brand Title'
expect
(
helper
.
page_description_default
).
to
eq
'Brand Title'
...
@@ -73,14 +73,14 @@ describe PageLayoutHelper do
...
@@ -73,14 +73,14 @@ describe PageLayoutHelper do
context
'with @project'
do
context
'with @project'
do
it
'uses Project avatar if available'
do
it
'uses Project avatar if available'
do
project
=
double
(
avatar_url:
'http://example.com/uploads/avatar.png'
)
project
=
double
(
avatar_url:
'http://example.com/uploads/avatar.png'
)
helper
.
instance_variable_set
(
:@
project
,
project
)
assign
(
:
project
,
project
)
expect
(
helper
.
page_image
).
to
eq
project
.
avatar_url
expect
(
helper
.
page_image
).
to
eq
project
.
avatar_url
end
end
it
'falls back to the default'
do
it
'falls back to the default'
do
project
=
double
(
avatar_url:
nil
)
project
=
double
(
avatar_url:
nil
)
helper
.
instance_variable_set
(
:@
project
,
project
)
assign
(
:
project
,
project
)
expect
(
helper
.
page_image
).
to
end_with
'assets/gitlab_logo.png'
expect
(
helper
.
page_image
).
to
end_with
'assets/gitlab_logo.png'
end
end
...
@@ -89,7 +89,7 @@ describe PageLayoutHelper do
...
@@ -89,7 +89,7 @@ describe PageLayoutHelper do
context
'with @user'
do
context
'with @user'
do
it
'delegates to avatar_icon helper'
do
it
'delegates to avatar_icon helper'
do
user
=
double
(
'User'
)
user
=
double
(
'User'
)
helper
.
instance_variable_set
(
:@
user
,
user
)
assign
(
:
user
,
user
)
expect
(
helper
).
to
receive
(
:avatar_icon
).
with
(
user
)
expect
(
helper
).
to
receive
(
:avatar_icon
).
with
(
user
)
...
@@ -100,14 +100,14 @@ describe PageLayoutHelper do
...
@@ -100,14 +100,14 @@ describe PageLayoutHelper do
context
'with @group'
do
context
'with @group'
do
it
'uses Group avatar if available'
do
it
'uses Group avatar if available'
do
group
=
double
(
avatar_url:
'http://example.com/uploads/avatar.png'
)
group
=
double
(
avatar_url:
'http://example.com/uploads/avatar.png'
)
helper
.
instance_variable_set
(
:@
group
,
group
)
assign
(
:
group
,
group
)
expect
(
helper
.
page_image
).
to
eq
group
.
avatar_url
expect
(
helper
.
page_image
).
to
eq
group
.
avatar_url
end
end
it
'falls back to the default'
do
it
'falls back to the default'
do
group
=
double
(
avatar_url:
nil
)
group
=
double
(
avatar_url:
nil
)
helper
.
instance_variable_set
(
:@
group
,
group
)
assign
(
:
group
,
group
)
expect
(
helper
.
page_image
).
to
end_with
'assets/gitlab_logo.png'
expect
(
helper
.
page_image
).
to
end_with
'assets/gitlab_logo.png'
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment