Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions __fixtures__/unit/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ module.exports = {
sha: 'sha1',
action: 'opened',
repository: {
name: (options.repoName) ? options.repoName : 'repoName',
full_name: 'name',
owner: {
login: 'owner'
Expand Down
68 changes: 66 additions & 2 deletions __tests__/unit/filters/repository.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,71 @@ test('fail to must exclude topic', async () => {
expect(filter.status).toBe('fail')
})

const mockContext = (repoPrivate, repoTopics) => {
const context = Helper.mockContext({ repoPrivate: repoPrivate, repoTopics: repoTopics })
test('fail to must include name', async () => {
const repo = new Repository()

const settings = {
do: 'repository',
name: {
must_include: {
regex: 'test-repo-2'
}
}
}

const filter = await repo.processFilter(mockContext(true, ['mytopic'], 'test-repo'), settings)
expect(filter.status).toBe('fail')
})

test('must_include name passes', async () => {
const repo = new Repository()

const settings = {
do: 'repository',
name: {
must_include: {
regex: 'test-repo-2'
}
}
}

const filter = await repo.processFilter(mockContext(true, ['mytopic'], 'test-repo-2'), settings)
expect(filter.status).toBe('pass')
})

test('fail to must exclude name', async () => {
const repo = new Repository()

const settings = {
do: 'repository',
name: {
must_exclude: {
regex: 'test-repo'
}
}
}

const filter = await repo.processFilter(mockContext(true, ['mytopic'], 'test-repo'), settings)
expect(filter.status).toBe('fail')
})

test('must_exclude name passes', async () => {
const repo = new Repository()

const settings = {
do: 'repository',
name: {
must_exclude: {
regex: 'test-repo'
}
}
}

const filter = await repo.processFilter(mockContext(true, ['mytopic'], 'not-desired-repo-2'), settings)
expect(filter.status).toBe('pass')
})

const mockContext = (repoPrivate, repoTopics, repoName) => {
const context = Helper.mockContext({ repoPrivate: repoPrivate, repoTopics: repoTopics, repoName: repoName })
return context
}
1 change: 1 addition & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CHANGELOG

| February 25, 2021 : fix: minor bugs `#508 <https://github.com/mergeability/mergeable/pull/508>`_
| February 25, 2021 : fix: Correct use of cache env
| February 21, 2021 : feat: `name` sub-option for `repository` filter
| February 18, 2021 : fix: Scheduler support `#499 <https://github.com/mergeability/mergeable/issues/499>`_
| February 12, 2021 : feat: Implemented redis as a dependency to the helm-chart
| February 10, 2021 : feat: global cache manager `#502 <https://github.com/mergeability/mergeable/pull/502>`_
Expand Down
5 changes: 5 additions & 0 deletions docs/filters/repository.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ Repository

- do: repository
visibility: 'public' # Can be public or private
name:
must_include:
regex: 'my-repo-name'
must_exclude:
regex: 'other-repo-name'
topics:
must_include:
regex: 'my-topic'
Expand Down
11 changes: 11 additions & 0 deletions lib/filters/options_processor/name.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const Options = require('./options')

class Name {
static async process (context, filter, settings) {
let input = context.payload.repository.name
let result = await Options.process(context, filter, input, settings.name)
return { input: {name: input}, result }
}
}

module.exports = Name
17 changes: 17 additions & 0 deletions lib/filters/repository.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const Topics = require('./options_processor/topics')
const Visibility = require('./options_processor/visibility')
const Name = require('./options_processor/name')
const { Filter } = require('./filter')
const consolidateResult = require('./options_processor/options/lib/consolidateResults')
const constructOutput = require('./options_processor/options/lib/constructOutput')
Expand All @@ -24,6 +25,18 @@ class Repository extends Filter {
regex_flag: 'string',
message: 'string'
}
},
name: {
must_include: {
regex: 'string',
regex_flag: 'string',
message: 'string'
},
must_exclude: {
regex: 'string',
regex_flag: 'string',
message: 'string'
}
}
}
}
Expand All @@ -46,6 +59,10 @@ class Repository extends Filter {
output.push(constructOutput(filter, processor.input, { visibility: settings.visibility }, processor.result))
}

if (settings.name) {
let processor = await Name.process(context, filter, settings)
output.push(constructOutput(filter, processor.input, { name: settings.name }, processor.result))
}
return consolidateResult(output, filter)
}
}
Expand Down