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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
75984534
Commit
75984534
authored
Feb 09, 2018
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup codes and address feedback
parent
578a98fb
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
22 additions
and
31 deletions
+22
-31
qa/qa/factory/resource/pipeline.rb
qa/qa/factory/resource/pipeline.rb
+0
-8
qa/qa/page/project/job/show.rb
qa/qa/page/project/job/show.rb
+9
-1
qa/qa/page/project/pipeline/index.rb
qa/qa/page/project/pipeline/index.rb
+6
-5
qa/qa/page/project/pipeline/show.rb
qa/qa/page/project/pipeline/show.rb
+2
-1
qa/qa/page/project/show.rb
qa/qa/page/project/show.rb
+1
-1
qa/qa/service/runner.rb
qa/qa/service/runner.rb
+0
-4
qa/qa/specs/features/cicd/pull_with_deploy_key_spec.rb
qa/qa/specs/features/cicd/pull_with_deploy_key_spec.rb
+4
-11
No files found.
qa/qa/factory/resource/pipeline.rb
deleted
100644 → 0
View file @
578a98fb
module
QA
module
Factory
module
Resource
class
Pipeline
<
Factory
::
Base
end
end
end
end
qa/qa/page/project/job/show.rb
View file @
75984534
module
QA::Page
module
Project::Job
class
Show
<
QA
::
Page
::
Base
view
'app/views/projects/jobs/show.html.haml'
do
element
:build_output
,
'.js-build-output'
end
def
output
css
=
'.js-build-output'
wait
{
has_css?
(
css
)
}
wait
(
reload:
false
)
do
has_css?
(
css
)
end
find
(
css
).
text
end
end
...
...
qa/qa/page/project/pipeline/index.rb
View file @
75984534
...
...
@@ -6,13 +6,14 @@ module QA::Page
end
def
go_to_latest_pipeline
first
(
'.js-pipeline-url-link'
).
click
end
css
=
'.js-pipeline-url-link'
link
=
nil
def
wait_for_latest_pipeline
wait
do
first
(
'.js-pipeline-url-link'
)
wait
(
reload:
false
)
do
link
=
first
(
css
)
end
link
.
click
end
end
end
...
...
qa/qa/page/project/pipeline/show.rb
View file @
75984534
...
...
@@ -11,6 +11,7 @@ module QA::Page
view
'app/assets/javascripts/pipelines/components/graph/job_component.vue'
do
element
:job_component
,
/class.*ci-job-component.*/
element
:job_link
,
/class.*js-pipeline-graph-job-link.*/
end
view
'app/assets/javascripts/vue_shared/components/ci_icon.vue'
do
...
...
@@ -34,7 +35,7 @@ module QA::Page
def
go_to_first_job
css
=
'.js-pipeline-graph-job-link'
wait
do
wait
(
reload:
false
)
do
has_css?
(
css
)
end
...
...
qa/qa/page/project/show.rb
View file @
75984534
...
...
@@ -62,7 +62,7 @@ module QA
click_link
(
kind
)
end
# Ensure git clone textbox was updated
to http URI
# Ensure git clone textbox was updated
repository_location
.
include?
(
detect_text
)
end
end
...
...
qa/qa/service/runner.rb
View file @
75984534
...
...
@@ -48,10 +48,6 @@ module QA
'gitlab-runner run'
]
if
@executor
==
'docker'
commands
.
unshift
(
'apt-get install -y docker-ce'
)
end
commands
.
join
(
' && '
)
end
end
...
...
qa/qa/specs/features/cicd/pull_with_deploy_key_spec.rb
View file @
75984534
...
...
@@ -8,7 +8,7 @@ module QA
Service
::
Runner
.
new
(
runner_name
).
remove!
end
scenario
'user
pushes .gitlab-ci.yml to the repository
'
do
scenario
'user
setup a deploy key and use it to pull from CI job
'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
...
...
@@ -52,7 +52,7 @@ module QA
cat-config:
script:
- mkdir -p ~/.ssh
- ssh-keyscan -p
#{
repository_uri
.
port
}
#{
repository_uri
.
host
}
>> ~/.ssh/known_hosts
- ssh-keyscan -p
#{
repository_uri
.
port
||
22
}
#{
repository_uri
.
host
}
>> ~/.ssh/known_hosts
- eval $(ssh-agent -s)
- echo "$DEPLOY_KEY" | ssh-add -
- git clone
#{
repository_url
}
...
...
@@ -73,15 +73,8 @@ module QA
Page
::
Project
::
Show
.
act
{
wait_for_push
}
Page
::
Menu
::
Side
.
act
{
click_ci_cd_pipelines
}
Page
::
Project
::
Pipeline
::
Index
.
act
do
wait_for_latest_pipeline
go_to_latest_pipeline
end
Page
::
Project
::
Pipeline
::
Show
.
act
do
go_to_first_job
end
Page
::
Project
::
Pipeline
::
Index
.
act
{
go_to_latest_pipeline
}
Page
::
Project
::
Pipeline
::
Show
.
act
{
go_to_first_job
}
Page
::
Project
::
Job
::
Show
.
perform
do
|
job
|
expect
(
job
.
output
).
to
include
(
sha1sum
)
...
...
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