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
63cd043b
Commit
63cd043b
authored
Mar 29, 2021
by
Michael Lunøe
Committed by
Phil Hughes
Mar 29, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Feat(buy_minutes): pass CI Minutes data to frontend
parent
8c37c23f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
123 additions
and
4 deletions
+123
-4
ee/app/assets/javascripts/pages/subscriptions/buy_minutes/index.js
...sets/javascripts/pages/subscriptions/buy_minutes/index.js
+1
-1
ee/app/assets/javascripts/subscriptions/buy_minutes/index.js
ee/app/assets/javascripts/subscriptions/buy_minutes/index.js
+12
-3
ee/app/assets/javascripts/subscriptions/buy_minutes/utils.js
ee/app/assets/javascripts/subscriptions/buy_minutes/utils.js
+11
-0
ee/spec/frontend/subscriptions/buy_minutes/index_spec.js
ee/spec/frontend/subscriptions/buy_minutes/index_spec.js
+58
-0
ee/spec/frontend/subscriptions/buy_minutes/mock_data.js
ee/spec/frontend/subscriptions/buy_minutes/mock_data.js
+16
-0
ee/spec/frontend/subscriptions/buy_minutes/utils_spec.js
ee/spec/frontend/subscriptions/buy_minutes/utils_spec.js
+25
-0
No files found.
ee/app/assets/javascripts/pages/subscriptions/buy_minutes/index.js
View file @
63cd043b
import
mountSubscriptionsApplication
from
'
ee/subscriptions/buy_minutes
'
;
mountSubscriptionsApplication
();
mountSubscriptionsApplication
(
document
.
getElementById
(
'
js-buy-minutes
'
)
);
ee/app/assets/javascripts/subscriptions/buy_minutes/index.js
View file @
63cd043b
import
Vue
from
'
vue
'
;
import
ensureData
from
'
~/ensure_data
'
;
import
{
parseBoolean
}
from
'
~/lib/utils/common_utils
'
;
import
App
from
'
./components/app.vue
'
;
import
apolloProvider
from
'
./graphql
'
;
import
seedQuery
from
'
./graphql/queries/seed.query.graphql
'
;
import
{
parseData
}
from
'
./utils
'
;
const
arrayToGraphqlArray
=
(
arr
,
typename
)
=>
Array
.
from
(
arr
,
(
item
)
=>
Object
.
assign
(
item
,
{
__typename
:
typename
}));
...
...
@@ -24,8 +26,15 @@ const writeInitialDataToApolloProvider = (dataset) => {
});
};
export
default
()
=>
{
const
el
=
document
.
getElementById
(
'
js-buy-minutes
'
);
export
default
(
el
)
=>
{
if
(
!
el
)
{
return
null
;
}
const
ExtendedApp
=
ensureData
(
App
,
{
parseData
,
data
:
el
.
dataset
,
});
writeInitialDataToApolloProvider
(
el
.
dataset
);
...
...
@@ -33,7 +42,7 @@ export default () => {
el
,
apolloProvider
,
render
(
createElement
)
{
return
createElement
(
App
);
return
createElement
(
Extended
App
);
},
});
};
ee/app/assets/javascripts/subscriptions/buy_minutes/utils.js
0 → 100644
View file @
63cd043b
import
{
convertObjectPropsToCamelCase
}
from
'
~/lib/utils/common_utils
'
;
export
function
parseData
(
dataset
)
{
const
{
ciMinutesPlans
}
=
dataset
;
return
{
ciMinutesPlans
:
convertObjectPropsToCamelCase
(
JSON
.
parse
(
ciMinutesPlans
),
{
deep
:
true
,
}),
};
}
ee/spec/frontend/subscriptions/buy_minutes/index_spec.js
0 → 100644
View file @
63cd043b
import
{
GlEmptyState
}
from
'
@gitlab/ui
'
;
import
*
as
Sentry
from
'
@sentry/browser
'
;
import
{
createWrapper
}
from
'
@vue/test-utils
'
;
import
initBuyMinutesApp
from
'
ee/subscriptions/buy_minutes
'
;
import
*
as
utils
from
'
ee/subscriptions/buy_minutes/utils
'
;
import
StepOrderApp
from
'
ee/vue_shared/components/step_order_app.vue
'
;
import
{
mockCiMinutesPlans
,
mockParsedCiMinutesPlans
}
from
'
./mock_data
'
;
jest
.
mock
(
'
ee/subscriptions/buy_minutes/utils
'
);
describe
(
'
initBuyMinutesApp
'
,
()
=>
{
let
vm
;
let
wrapper
;
function
createComponent
()
{
const
el
=
document
.
createElement
(
'
div
'
);
Object
.
assign
(
el
.
dataset
,
{
ciMinutesPlans
:
mockCiMinutesPlans
,
groupData
:
'
[]
'
});
vm
=
initBuyMinutesApp
(
el
).
$mount
();
wrapper
=
createWrapper
(
vm
);
}
beforeEach
(()
=>
{
Sentry
.
captureException
=
jest
.
fn
();
});
afterEach
(()
=>
{
if
(
vm
)
{
vm
.
$destroy
();
}
wrapper
.
destroy
();
vm
=
null
;
Sentry
.
captureException
.
mockClear
();
utils
.
parseData
.
mockClear
();
});
describe
(
'
when parsing fails
'
,
()
=>
{
it
(
'
displays the EmptyState
'
,
()
=>
{
utils
.
parseData
.
mockImplementation
(()
=>
{
throw
new
Error
();
});
createComponent
();
expect
(
wrapper
.
find
(
StepOrderApp
).
exists
()).
toBe
(
false
);
expect
(
wrapper
.
find
(
GlEmptyState
).
exists
()).
toBe
(
true
);
expect
(
Sentry
.
captureException
).
not
.
toHaveBeenCalled
();
});
});
describe
(
'
when parsing succeeds
'
,
()
=>
{
it
(
'
displays the StepOrderApp
'
,
()
=>
{
utils
.
parseData
.
mockImplementation
(()
=>
mockParsedCiMinutesPlans
);
createComponent
();
expect
(
wrapper
.
find
(
GlEmptyState
).
exists
()).
toBe
(
false
);
expect
(
wrapper
.
find
(
StepOrderApp
).
exists
()).
toBe
(
true
);
expect
(
Sentry
.
captureException
).
not
.
toHaveBeenCalled
();
});
});
});
ee/spec/frontend/subscriptions/buy_minutes/mock_data.js
0 → 100644
View file @
63cd043b
export
const
mockCiMinutesPlans
=
'
[{"deprecated":false,"name":"1000 CI minutes pack","code":"ci_minutes","active":true,"free":null,"price_per_month":0.8333333333333334,"price_per_year":10.0,"features":null,"about_page_href":null,"hide_deprecated_card":false}]
'
;
export
const
mockParsedCiMinutesPlans
=
[
{
deprecated
:
false
,
name
:
'
1000 CI minutes pack
'
,
code
:
'
ci_minutes
'
,
active
:
true
,
free
:
null
,
pricePerMonth
:
0.8333333333333334
,
pricePerYear
:
10.0
,
features
:
null
,
aboutPageHref
:
null
,
hideDeprecatedCard
:
false
,
},
];
ee/spec/frontend/subscriptions/buy_minutes/utils_spec.js
0 → 100644
View file @
63cd043b
import
{
parseData
}
from
'
ee/subscriptions/buy_minutes/utils
'
;
import
{
mockCiMinutesPlans
,
mockParsedCiMinutesPlans
}
from
'
./mock_data
'
;
describe
(
'
utils
'
,
()
=>
{
describe
(
'
#parseData
'
,
()
=>
{
describe
.
each
`
ciMinutesPlans | parsedCiMinutesPlans | throws
${
'
[]
'
}
|
${[]}
|
${
false
}
${
'
null
'
}
|
${{}}
|
$
{
false
}
${
mockCiMinutesPlans
}
|
${
mockParsedCiMinutesPlans
}
|
${
false
}
${
''
}
|
${{}}
|
$
{
true
}
`
(
'
parameter decoding
'
,
({
ciMinutesPlans
,
parsedCiMinutesPlans
,
throws
})
=>
{
it
(
`decodes
${
ciMinutesPlans
}
to
${
parsedCiMinutesPlans
}
`
,
()
=>
{
if
(
throws
)
{
expect
(()
=>
{
parseData
({
ciMinutesPlans
});
}).
toThrow
();
}
else
{
const
result
=
parseData
({
ciMinutesPlans
});
expect
(
result
.
ciMinutesPlans
).
toEqual
(
parsedCiMinutesPlans
);
}
});
});
});
});
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