Skip to content

Commit

Permalink
Rename locations to places
Browse files Browse the repository at this point in the history
Signed-off-by: Louis Chemineau <louis@chmn.me>
  • Loading branch information
artonge committed Feb 23, 2023
1 parent ec6219b commit 049950b
Show file tree
Hide file tree
Showing 44 changed files with 240 additions and 240 deletions.
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<commands>
<command>OCA\Photos\Command\UpdateReverseGeocodingFilesCommand</command>
<command>OCA\Photos\Command\MapMediaToLocationCommand</command>
<command>OCA\Photos\Command\MapMediaToPlaceCommand</command>
</commands>

<sabre>
Expand All @@ -46,6 +46,6 @@
</sabre>

<background-jobs>
<job>OCA\Photos\Jobs\AutomaticLocationMapperJob</job>
<job>OCA\Photos\Jobs\AutomaticPlaceMapperJob</job>
</background-jobs>
</info>
2 changes: 1 addition & 1 deletion appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
'path' => '',
]
],
['name' => 'page#index', 'url' => '/locations/{path}', 'verb' => 'GET', 'postfix' => 'locations',
['name' => 'page#index', 'url' => '/places/{path}', 'verb' => 'GET', 'postfix' => 'places',
'requirements' => [
'path' => '.*',
],
Expand Down
10 changes: 5 additions & 5 deletions cypress/e2e/albums.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,21 +128,21 @@ describe('Manage albums', () => {
cy.contains('Save').click()
})

it('Edit an album\'s location', () => {
it('Edit an album\'s place', () => {
cy.get('[aria-label="Open actions menu"]').click()
cy.contains('Edit album details').click()
cy.get('form [name="location"]').clear().type('New location')
cy.get('form [name="place"]').clear().type('New place')
cy.contains('Save').click()

cy.contains('New location')
cy.contains('New place')

cy.reload()

cy.contains('New location')
cy.contains('New place')

cy.get('[aria-label="Open actions menu"]').click()
cy.contains('Edit album details').click()
cy.get('form [name="location"]').clear()
cy.get('form [name="place"]').clear()
cy.contains('Save').click()
})
})
14 changes: 7 additions & 7 deletions cypress/e2e/locations.cy.js → cypress/e2e/places.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
*/
import { uploadTestMedia } from './photosUtils'
import { navigateToLocation, runOccCommand } from './locationsUtils'
import { navigateToPlace, runOccCommand } from './placesUtils'

const resizeObserverLoopErrRe = /^[^(ResizeObserver loop limit exceeded)]/
Cypress.on('uncaught:exception', (err) => {
Expand All @@ -30,27 +30,27 @@ Cypress.on('uncaught:exception', (err) => {
}
})

describe('Manage locations', () => {
describe('Manage places', () => {
before(function() {
cy.createRandomUser()
.then((user) => {
uploadTestMedia(user)
runOccCommand(`photos:map-media-to-location --user ${user.userId}`)
runOccCommand(`photos:map-media-to-place --user ${user.userId}`)
cy.login(user)
cy.visit('/apps/photos')
})
})

beforeEach(() => {
cy.visit('apps/photos/locations')
cy.visit('apps/photos/places')
})

it('Check that we detect some locations out of the existing files', () => {
it('Check that we detect some places out of the existing files', () => {
cy.get('ul.collections__list li').should('have.length', 4)
})

it('Navigate to location and check that it contains some files', () => {
navigateToLocation('Lauris')
it('Navigate to place and check that it contains some files', () => {
navigateToPlace('Lauris')
cy.get('[data-test="media"]').should('have.length', 1)
})
})
File renamed without changes.
4 changes: 2 additions & 2 deletions js/photos-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-main.js.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions js/photos-public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-public.js.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions js/photos-src_views_Locations_vue.js

This file was deleted.

1 change: 0 additions & 1 deletion js/photos-src_views_Locations_vue.js.map

This file was deleted.

3 changes: 3 additions & 0 deletions js/photos-src_views_Places_vue.js

Large diffs are not rendered by default.

Loading

0 comments on commit 049950b

Please sign in to comment.