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
a7a53cd0
Commit
a7a53cd0
authored
May 05, 2017
by
winh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace pipeline mock data with JSON fixture
parent
1daa133c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
62 additions
and
202 deletions
+62
-202
spec/javascripts/commit/pipelines/mock_data.js
spec/javascripts/commit/pipelines/mock_data.js
+0
-90
spec/javascripts/commit/pipelines/pipelines_spec.js
spec/javascripts/commit/pipelines/pipelines_spec.js
+6
-1
spec/javascripts/fixtures/pipelines.rb
spec/javascripts/fixtures/pipelines.rb
+35
-0
spec/javascripts/pipelines/mock_data.js
spec/javascripts/pipelines/mock_data.js
+0
-107
spec/javascripts/pipelines/pipelines_spec.js
spec/javascripts/pipelines/pipelines_spec.js
+7
-2
spec/javascripts/vue_shared/components/pipelines_table_row_spec.js
...scripts/vue_shared/components/pipelines_table_row_spec.js
+7
-1
spec/javascripts/vue_shared/components/pipelines_table_spec.js
...javascripts/vue_shared/components/pipelines_table_spec.js
+7
-1
No files found.
spec/javascripts/commit/pipelines/mock_data.js
deleted
100644 → 0
View file @
1daa133c
export
default
{
id
:
73
,
user
:
{
name
:
'
Administrator
'
,
username
:
'
root
'
,
id
:
1
,
state
:
'
active
'
,
avatar_url
:
'
http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon
'
,
web_url
:
'
http://localhost:3000/root
'
,
},
path
:
'
/root/review-app/pipelines/73
'
,
details
:
{
status
:
{
icon
:
'
icon_status_failed
'
,
text
:
'
failed
'
,
label
:
'
failed
'
,
group
:
'
failed
'
,
has_details
:
true
,
details_path
:
'
/root/review-app/pipelines/73
'
,
},
duration
:
null
,
finished_at
:
'
2017-01-25T00:00:17.130Z
'
,
stages
:
[{
name
:
'
build
'
,
title
:
'
build: failed
'
,
status
:
{
icon
:
'
icon_status_failed
'
,
text
:
'
failed
'
,
label
:
'
failed
'
,
group
:
'
failed
'
,
has_details
:
true
,
details_path
:
'
/root/review-app/pipelines/73#build
'
,
},
path
:
'
/root/review-app/pipelines/73#build
'
,
dropdown_path
:
'
/root/review-app/pipelines/73/stage.json?stage=build
'
,
}],
artifacts
:
[],
manual_actions
:
[
{
name
:
'
stop_review
'
,
path
:
'
/root/review-app/builds/1463/play
'
,
},
{
name
:
'
name
'
,
path
:
'
/root/review-app/builds/1490/play
'
,
},
],
},
flags
:
{
latest
:
true
,
triggered
:
false
,
stuck
:
false
,
yaml_errors
:
false
,
retryable
:
true
,
cancelable
:
false
,
},
ref
:
{
name
:
'
master
'
,
path
:
'
/root/review-app/tree/master
'
,
tag
:
false
,
branch
:
true
,
},
coverage
:
'
42.21
'
,
commit
:
{
id
:
'
fbd79f04fa98717641deaaeb092a4d417237c2e4
'
,
short_id
:
'
fbd79f04
'
,
title
:
'
Update .gitlab-ci.yml
'
,
author_name
:
'
Administrator
'
,
author_email
:
'
admin@example.com
'
,
created_at
:
'
2017-01-16T12:13:57.000-05:00
'
,
committer_name
:
'
Administrator
'
,
committer_email
:
'
admin@example.com
'
,
message
:
'
Update .gitlab-ci.yml
'
,
author
:
{
name
:
'
Administrator
'
,
username
:
'
root
'
,
id
:
1
,
state
:
'
active
'
,
avatar_url
:
'
http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon
'
,
web_url
:
'
http://localhost:3000/root
'
,
},
author_gravatar_url
:
'
http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon
'
,
commit_url
:
'
http://localhost:3000/root/review-app/commit/fbd79f04fa98717641deaaeb092a4d417237c2e4
'
,
commit_path
:
'
/root/review-app/commit/fbd79f04fa98717641deaaeb092a4d417237c2e4
'
,
},
retry_path
:
'
/root/review-app/pipelines/73/retry
'
,
created_at
:
'
2017-01-16T17:13:59.800Z
'
,
updated_at
:
'
2017-01-25T00:00:17.132Z
'
,
};
spec/javascripts/commit/pipelines/pipelines_spec.js
View file @
a7a53cd0
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
PipelinesTable
from
'
~/commit/pipelines/pipelines_table
'
;
import
PipelinesTable
from
'
~/commit/pipelines/pipelines_table
'
;
import
pipeline
from
'
./mock_data
'
;
describe
(
'
Pipelines table in Commits and Merge requests
'
,
()
=>
{
describe
(
'
Pipelines table in Commits and Merge requests
'
,
()
=>
{
const
jsonFixtureName
=
'
pipelines/pipelines.json
'
;
let
pipeline
;
preloadFixtures
(
'
static/pipelines_table.html.raw
'
);
preloadFixtures
(
'
static/pipelines_table.html.raw
'
);
preloadFixtures
(
jsonFixtureName
);
beforeEach
(()
=>
{
beforeEach
(()
=>
{
loadFixtures
(
'
static/pipelines_table.html.raw
'
);
loadFixtures
(
'
static/pipelines_table.html.raw
'
);
const
pipelines
=
getJSONFixture
(
jsonFixtureName
).
pipelines
;
pipeline
=
pipelines
.
find
(
p
=>
p
.
id
===
1
);
});
});
describe
(
'
successful request
'
,
()
=>
{
describe
(
'
successful request
'
,
()
=>
{
...
...
spec/javascripts/fixtures/pipelines.rb
0 → 100644
View file @
a7a53cd0
require
'spec_helper'
describe
Projects
::
PipelinesController
,
'(JavaScript fixtures)'
,
type: :controller
do
include
JavaScriptFixturesHelpers
let
(
:admin
)
{
create
(
:admin
)
}
let
(
:namespace
)
{
create
(
:namespace
,
name:
'frontend-fixtures'
)}
let
(
:project
)
{
create
(
:project
,
:repository
,
namespace:
namespace
,
path:
'pipelines-project'
)
}
let
(
:commit
)
{
create
(
:commit
,
project:
project
)
}
let
(
:commit_without_author
)
{
RepoHelpers
.
another_sample_commit
}
let!
(
:user
)
{
create
(
:user
,
email:
commit
.
author_email
)
}
let!
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
,
sha:
commit
.
id
,
user:
user
)
}
let!
(
:pipeline_without_author
)
{
create
(
:ci_pipeline
,
project:
project
,
sha:
commit_without_author
.
id
)
}
let!
(
:pipeline_without_commit
)
{
create
(
:ci_pipeline
,
project:
project
,
sha:
'0000'
)
}
render_views
before
(
:all
)
do
clean_frontend_fixtures
(
'pipelines/'
)
end
before
(
:each
)
do
sign_in
(
admin
)
end
it
'pipelines/pipelines.json'
do
|
example
|
get
:index
,
namespace_id:
namespace
,
project_id:
project
,
format: :json
expect
(
response
).
to
be_success
store_frontend_fixture
(
response
,
example
.
description
)
end
end
spec/javascripts/pipelines/mock_data.js
deleted
100644 → 0
View file @
1daa133c
export
default
{
pipelines
:
[{
id
:
115
,
user
:
{
name
:
'
Root
'
,
username
:
'
root
'
,
id
:
1
,
state
:
'
active
'
,
avatar_url
:
'
http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80
\
u0026d=identicon
'
,
web_url
:
'
http://localhost:3000/root
'
,
},
path
:
'
/root/review-app/pipelines/115
'
,
details
:
{
status
:
{
icon
:
'
icon_status_failed
'
,
text
:
'
failed
'
,
label
:
'
failed
'
,
group
:
'
failed
'
,
has_details
:
true
,
details_path
:
'
/root/review-app/pipelines/115
'
,
},
duration
:
null
,
finished_at
:
'
2017-03-17T19:00:15.996Z
'
,
stages
:
[{
name
:
'
build
'
,
title
:
'
build: failed
'
,
status
:
{
icon
:
'
icon_status_failed
'
,
text
:
'
failed
'
,
label
:
'
failed
'
,
group
:
'
failed
'
,
has_details
:
true
,
details_path
:
'
/root/review-app/pipelines/115#build
'
,
},
path
:
'
/root/review-app/pipelines/115#build
'
,
dropdown_path
:
'
/root/review-app/pipelines/115/stage.json?stage=build
'
,
},
{
name
:
'
review
'
,
title
:
'
review: skipped
'
,
status
:
{
icon
:
'
icon_status_skipped
'
,
text
:
'
skipped
'
,
label
:
'
skipped
'
,
group
:
'
skipped
'
,
has_details
:
true
,
details_path
:
'
/root/review-app/pipelines/115#review
'
,
},
path
:
'
/root/review-app/pipelines/115#review
'
,
dropdown_path
:
'
/root/review-app/pipelines/115/stage.json?stage=review
'
,
}],
artifacts
:
[],
manual_actions
:
[{
name
:
'
stop_review
'
,
path
:
'
/root/review-app/builds/3766/play
'
,
}],
},
flags
:
{
latest
:
true
,
triggered
:
false
,
stuck
:
false
,
yaml_errors
:
false
,
retryable
:
true
,
cancelable
:
false
,
},
ref
:
{
name
:
'
thisisabranch
'
,
path
:
'
/root/review-app/tree/thisisabranch
'
,
tag
:
false
,
branch
:
true
,
},
commit
:
{
id
:
'
9e87f87625b26c42c59a2ee0398f81d20cdfe600
'
,
short_id
:
'
9e87f876
'
,
title
:
'
Update README.md
'
,
created_at
:
'
2017-03-15T22:58:28.000+00:00
'
,
parent_ids
:
[
'
3744f9226e699faec2662a8b267e5d3fd0bfff0e
'
],
message
:
'
Update README.md
'
,
author_name
:
'
Root
'
,
author_email
:
'
admin@example.com
'
,
authored_date
:
'
2017-03-15T22:58:28.000+00:00
'
,
committer_name
:
'
Root
'
,
committer_email
:
'
admin@example.com
'
,
committed_date
:
'
2017-03-15T22:58:28.000+00:00
'
,
author
:
{
name
:
'
Root
'
,
username
:
'
root
'
,
id
:
1
,
state
:
'
active
'
,
avatar_url
:
'
http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80
\
u0026d=identicon
'
,
web_url
:
'
http://localhost:3000/root
'
,
},
author_gravatar_url
:
'
http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80
\
u0026d=identicon
'
,
commit_url
:
'
http://localhost:3000/root/review-app/commit/9e87f87625b26c42c59a2ee0398f81d20cdfe600
'
,
commit_path
:
'
/root/review-app/commit/9e87f87625b26c42c59a2ee0398f81d20cdfe600
'
,
},
retry_path
:
'
/root/review-app/pipelines/115/retry
'
,
created_at
:
'
2017-03-15T22:58:33.436Z
'
,
updated_at
:
'
2017-03-17T19:00:15.997Z
'
,
}],
count
:
{
all
:
52
,
running
:
0
,
pending
:
0
,
finished
:
52
,
},
};
spec/javascripts/pipelines/pipelines_spec.js
View file @
a7a53cd0
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
pipelinesComp
from
'
~/pipelines/pipelines
'
;
import
pipelinesComp
from
'
~/pipelines/pipelines
'
;
import
Store
from
'
~/pipelines/stores/pipelines_store
'
;
import
Store
from
'
~/pipelines/stores/pipelines_store
'
;
import
pipelinesData
from
'
./mock_data
'
;
describe
(
'
Pipelines
'
,
()
=>
{
describe
(
'
Pipelines
'
,
()
=>
{
const
jsonFixtureName
=
'
pipelines/pipelines.json
'
;
preloadFixtures
(
'
static/pipelines.html.raw
'
);
preloadFixtures
(
'
static/pipelines.html.raw
'
);
preloadFixtures
(
jsonFixtureName
);
let
PipelinesComponent
;
let
PipelinesComponent
;
let
pipeline
;
beforeEach
(()
=>
{
beforeEach
(()
=>
{
loadFixtures
(
'
static/pipelines.html.raw
'
);
loadFixtures
(
'
static/pipelines.html.raw
'
);
const
pipelines
=
getJSONFixture
(
jsonFixtureName
).
pipelines
;
pipeline
=
pipelines
.
find
(
p
=>
p
.
id
===
1
);
PipelinesComponent
=
Vue
.
extend
(
pipelinesComp
);
PipelinesComponent
=
Vue
.
extend
(
pipelinesComp
);
});
});
...
@@ -17,7 +22,7 @@ describe('Pipelines', () => {
...
@@ -17,7 +22,7 @@ describe('Pipelines', () => {
describe
(
'
successfull request
'
,
()
=>
{
describe
(
'
successfull request
'
,
()
=>
{
describe
(
'
with pipelines
'
,
()
=>
{
describe
(
'
with pipelines
'
,
()
=>
{
const
pipelinesInterceptor
=
(
request
,
next
)
=>
{
const
pipelinesInterceptor
=
(
request
,
next
)
=>
{
next
(
request
.
respondWith
(
JSON
.
stringify
(
pipeline
sData
),
{
next
(
request
.
respondWith
(
JSON
.
stringify
(
pipeline
),
{
status
:
200
,
status
:
200
,
}));
}));
};
};
...
...
spec/javascripts/vue_shared/components/pipelines_table_row_spec.js
View file @
a7a53cd0
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
tableRowComp
from
'
~/vue_shared/components/pipelines_table_row
'
;
import
tableRowComp
from
'
~/vue_shared/components/pipelines_table_row
'
;
import
pipeline
from
'
../../commit/pipelines/mock_data
'
;
describe
(
'
Pipelines Table Row
'
,
()
=>
{
describe
(
'
Pipelines Table Row
'
,
()
=>
{
const
jsonFixtureName
=
'
pipelines/pipelines.json
'
;
let
component
;
let
component
;
let
pipeline
;
preloadFixtures
(
jsonFixtureName
);
beforeEach
(()
=>
{
beforeEach
(()
=>
{
const
pipelines
=
getJSONFixture
(
jsonFixtureName
).
pipelines
;
pipeline
=
pipelines
.
find
(
p
=>
p
.
id
===
1
);
const
PipelinesTableRowComponent
=
Vue
.
extend
(
tableRowComp
);
const
PipelinesTableRowComponent
=
Vue
.
extend
(
tableRowComp
);
component
=
new
PipelinesTableRowComponent
({
component
=
new
PipelinesTableRowComponent
({
...
...
spec/javascripts/vue_shared/components/pipelines_table_spec.js
View file @
a7a53cd0
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
pipelinesTableComp
from
'
~/vue_shared/components/pipelines_table
'
;
import
pipelinesTableComp
from
'
~/vue_shared/components/pipelines_table
'
;
import
'
~/lib/utils/datetime_utility
'
;
import
'
~/lib/utils/datetime_utility
'
;
import
pipeline
from
'
../../commit/pipelines/mock_data
'
;
describe
(
'
Pipelines Table
'
,
()
=>
{
describe
(
'
Pipelines Table
'
,
()
=>
{
const
jsonFixtureName
=
'
pipelines/pipelines.json
'
;
let
pipeline
;
let
PipelinesTableComponent
;
let
PipelinesTableComponent
;
preloadFixtures
(
jsonFixtureName
);
beforeEach
(()
=>
{
beforeEach
(()
=>
{
PipelinesTableComponent
=
Vue
.
extend
(
pipelinesTableComp
);
PipelinesTableComponent
=
Vue
.
extend
(
pipelinesTableComp
);
const
pipelines
=
getJSONFixture
(
jsonFixtureName
).
pipelines
;
pipeline
=
pipelines
.
find
(
p
=>
p
.
id
===
1
);
});
});
describe
(
'
table
'
,
()
=>
{
describe
(
'
table
'
,
()
=>
{
...
...
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