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
452123eb
Commit
452123eb
authored
Aug 06, 2018
by
samdbeckham
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes the tests and lints the remaining files
parent
56a52339
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
38 deletions
+0
-38
ee/app/assets/javascripts/vue_shared/license_management/components/license_issue_body.vue
...ared/license_management/components/license_issue_body.vue
+0
-1
ee/spec/javascripts/license_management/components/license_issue_body_spec.js
.../license_management/components/license_issue_body_spec.js
+0
-37
No files found.
ee/app/assets/javascripts/vue_shared/license_management/components/license_issue_body.vue
View file @
452123eb
<
script
>
<
script
>
import
{
mapActions
}
from
'
vuex
'
;
import
{
mapActions
}
from
'
vuex
'
;
import
{
s__
}
from
'
~/locale/index
'
;
import
LicensePackages
from
'
./license_packages.vue
'
;
import
LicensePackages
from
'
./license_packages.vue
'
;
...
...
ee/spec/javascripts/license_management/components/license_issue_body_spec.js
View file @
452123eb
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
LicenseIssueBody
from
'
ee/vue_shared/license_management/components/license_issue_body.vue
'
;
import
LicenseIssueBody
from
'
ee/vue_shared/license_management/components/license_issue_body.vue
'
;
import
{
LICENSE_APPROVAL_STATUS
}
from
'
ee/vue_shared/license_management/constants
'
;
import
{
trimText
}
from
'
spec/helpers/vue_component_helper
'
;
import
{
trimText
}
from
'
spec/helpers/vue_component_helper
'
;
import
{
mountComponentWithStore
}
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
mountComponentWithStore
}
from
'
spec/helpers/vue_mount_component_helper
'
;
import
createStore
from
'
ee/vue_shared/license_management/store
'
;
import
createStore
from
'
ee/vue_shared/license_management/store
'
;
...
@@ -22,42 +21,6 @@ describe('LicenseIssueBody', () => {
...
@@ -22,42 +21,6 @@ describe('LicenseIssueBody', () => {
vm
.
$destroy
();
vm
.
$destroy
();
});
});
describe
(
'
computed
'
,
()
=>
{
describe
(
'
status
'
,
()
=>
{
it
(
'
returns correct status for Approved licenses
'
,
done
=>
{
vm
.
issue
=
{
...
vm
.
issue
,
approvalStatus
:
LICENSE_APPROVAL_STATUS
.
APPROVED
};
Vue
.
nextTick
()
.
then
(()
=>
{
expect
(
vm
.
status
).
toBe
(
'
Approved
'
);
})
.
then
(
done
)
.
catch
(
done
.
fail
);
});
it
(
'
returns correct status for Blacklisted licenses
'
,
done
=>
{
vm
.
issue
=
{
...
vm
.
issue
,
approvalStatus
:
LICENSE_APPROVAL_STATUS
.
BLACKLISTED
};
Vue
.
nextTick
()
.
then
(()
=>
{
expect
(
vm
.
status
).
toBe
(
'
Blacklisted
'
);
})
.
then
(
done
)
.
catch
(
done
.
fail
);
});
it
(
'
returns correct status for Unapproved licenses
'
,
done
=>
{
vm
.
issue
=
{
...
vm
.
issue
,
approvalStatus
:
undefined
};
Vue
.
nextTick
()
.
then
(()
=>
{
expect
(
vm
.
status
).
toBe
(
'
Unapproved
'
);
})
.
then
(
done
)
.
catch
(
done
.
fail
);
});
});
});
describe
(
'
interaction
'
,
()
=>
{
describe
(
'
interaction
'
,
()
=>
{
it
(
'
clicking the button triggers openModal with the current license
'
,
()
=>
{
it
(
'
clicking the button triggers openModal with the current license
'
,
()
=>
{
const
linkEl
=
vm
.
$el
.
querySelector
(
'
.license-item > .btn-link
'
);
const
linkEl
=
vm
.
$el
.
querySelector
(
'
.license-item > .btn-link
'
);
...
...
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