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
cf678945
Commit
cf678945
authored
Apr 11, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Finished feature specs
parent
18751fb1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
app/views/projects/blob/_bmpr.html.haml
app/views/projects/blob/_bmpr.html.haml
+1
-1
spec/features/projects/blobs/balsamiq_preview_spec.rb
spec/features/projects/blobs/balsamiq_preview_spec.rb
+7
-4
spec/support/test_env.rb
spec/support/test_env.rb
+1
-0
No files found.
app/views/projects/blob/_bmpr.html.haml
View file @
cf678945
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'balsamiq_viewer'
)
=
page_specific_javascript_bundle_tag
(
'balsamiq_viewer'
)
.file-content
#js-balsamiq-viewer
{
data:
{
endpoint:
namespace_project_raw_path
(
@project
.
namespace
,
@project
,
@id
)
}
}
.file-content
.balsamiq-viewer
#js-balsamiq-viewer
{
data:
{
endpoint:
namespace_project_raw_path
(
@project
.
namespace
,
@project
,
@id
)
}
}
spec/features/projects/blobs/balsamiq_preview_spec.rb
View file @
cf678945
...
@@ -7,18 +7,21 @@ feature 'Balsamiq preview', :feature, :js do
...
@@ -7,18 +7,21 @@ feature 'Balsamiq preview', :feature, :js do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:branch
)
{
'add-balsamiq-file'
}
let
(
:branch
)
{
'add-balsamiq-file'
}
let
(
:path
)
{
'files/images/balsamiq.bmpr'
}
let
(
:path
)
{
'files/images/balsamiq.bmpr'
}
let
(
:file_content
)
{
find
(
'.file-content'
)
}
before
do
before
do
project
.
add_master
(
user
)
project
.
add_master
(
user
)
login_as
user
login_as
user
p
namespace_project_blob_path
(
project
.
namespace
,
project
,
tree_join
(
branch
,
path
))
visit
namespace_project_blob_path
(
project
.
namespace
,
project
,
tree_join
(
branch
,
path
))
visit
namespace_project_blob_path
(
project
.
namespace
,
project
,
tree_join
(
branch
,
path
))
end
end
it
'should'
do
it
'should show a loading icon'
do
screenshot_and_open_image
expect
(
file_content
).
to
have_selector
(
'.loading'
)
end
it
'should show a viewer container'
do
expect
(
page
).
to
have_selector
(
'.balsamiq-viewer'
)
end
end
end
end
spec/support/test_env.rb
View file @
cf678945
...
@@ -27,6 +27,7 @@ module TestEnv
...
@@ -27,6 +27,7 @@ module TestEnv
'expand-collapse-files'
=>
'025db92'
,
'expand-collapse-files'
=>
'025db92'
,
'expand-collapse-lines'
=>
'238e82d'
,
'expand-collapse-lines'
=>
'238e82d'
,
'video'
=>
'8879059'
,
'video'
=>
'8879059'
,
'add-balsamiq-file'
=>
'b89b56d'
,
'crlf-diff'
=>
'5938907'
,
'crlf-diff'
=>
'5938907'
,
'conflict-start'
=>
'824be60'
,
'conflict-start'
=>
'824be60'
,
'conflict-resolvable'
=>
'1450cd6'
,
'conflict-resolvable'
=>
'1450cd6'
,
...
...
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