Skip to content

[WIP] Rename /modules to /packages (#285) #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
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
6 changes: 3 additions & 3 deletions app/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ AppRouter.map(function() {
// project-version.module => project-version.modules.module
// routes/project-version/module => routes/project-version/modules/module
// routes/project-version/module/* => routes/project-version/modules/module/*
this.route('modules', function() {
this.route('modules', {path: '/packages'}, function() {
this.route('module', {path: '/:module'}, itemRoutes);
});
// this.route('module', {path: '/modules/:module'}, itemRoutes);
Expand All @@ -64,9 +64,9 @@ AppRouter.map(function() {
}
});
this.route('class', {path: '/classes/:class'});
this.route('module', {path: '/modules/:module'});
this.route('module', {path: '/packages/:module_id'});
this.route('data-class', {path: '/data/classes/:class'});
this.route('data-module', {path: '/data/modules/:module'});
this.route('data-module', {path: '/data/packages/:module'});
});

export default AppRouter;
3 changes: 1 addition & 2 deletions app/templates/components/table-of-contents.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ol class="toc-level-0">
<li class="toc-level-0">
<a {{action 'toggle' 'modules'}} href="#">Modules</a>
<a {{action 'toggle' 'modules'}} href="#">Packages</a>
<ol class="toc-level-1 modules" style="display: block">
{{#each moduleIDs as |moduleID|}}
<li class="toc-level-1" data-test-module={{moduleID}}>
Expand Down Expand Up @@ -34,4 +34,3 @@
{{input type="checkbox" checked=showPrivateClasses class='private-deprecated-toggle'}}
Show Private / Deprecated
</label>

2 changes: 1 addition & 1 deletion app/templates/project-version/modules/module.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

{{#if submodules}}
<section>
<h2>Submodules</h2>
<h2>Subpackages</h2>
<ul class="spec-method-list">
{{#each submodules as |module|}}
<li>
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/analytics-page-tracking-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ moduleForAcceptance('Acceptance | analytics page tracking');

test('checking that trackPage gets called on transitions', async function(assert) {

const pages = ['/ember/2.11/namespaces/Ember', '/ember/2.11/modules/ember-metal', '/ember/2.11/classes/Ember.Application'];
const pages = ['/ember/2.11/namespaces/Ember', '/ember/2.11/packages/ember-metal', '/ember/2.11/classes/Ember.Application'];
const pagesClone = pages.slice(0);
const analyticsService = this.application.__container__.lookup('service:analytics');
assert.expect(pages.length);
Expand Down
18 changes: 9 additions & 9 deletions tests/acceptance/module-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { visit, click } from 'ember-native-dom-helpers';

moduleForAcceptance('Acceptance | Module');

test('lists all public/private classes and namespaces on the module page', async function(assert) {
await visit('ember/1.0/modules/ember-handlebars');
test('lists all public/private classes and namespaces on the package page', async function(assert) {
await visit('ember/1.0/packages/ember-handlebars');

const store = this.application.__container__.lookup('service:store');
const container = store.peekRecord('module', 'ember-1.0.0-ember-handlebars');
Expand All @@ -20,22 +20,22 @@ test('lists all public/private classes and namespaces on the module page', async
assert.equal(find('.spec-property-list li').length, numberPublicClasses + numberNameSpaces + numberPrivateClasses);
});

test('lists all submodules on the module page', async function(assert) {
await visit('ember/1.0/modules/ember');

test('lists all subpackages on the package page', async function(assert) {
await visit('ember/1.0/packages/ember');
const store = this.application.__container__.lookup('service:store');
const container = store.peekRecord('module', 'ember-1.0.0-ember');

let numberSubModules = Object.keys(container.get('submodules')).length;

let numberSubModules = Object.keys(container.get('submodule')).length;
assert.equal(find('.spec-method-list li').length, numberSubModules);
});

test('display submodule parent', async function(assert) {
await visit('ember/1.0/modules/ember-application');
test('display subpackage parent', async function(assert) {
await visit('ember/1.0/packages/ember-application');

const store = this.application.__container__.lookup('service:store');
const container = store.peekRecord('module', 'ember-1.0.0-ember-application');

assert.ok(find(`.attribute-value:contains(${container.get('parent')})`).length);
});

// redirect /modules to /packages*
8 changes: 4 additions & 4 deletions tests/acceptance/scroll-reset-on-transition-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ test('reset scroll on transitions', async function(assert) {
assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project.version.class.index to project-version.class.index (same route different model)');
$(scrollContainerElement).scrollTop(1000);

await visit('ember/1.0/modules/ember');
await visit('ember/1.0/packages/ember');

assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project-version.class.index to project-version.module.index');
assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project-version.class.index to project-version.package.index');
$(scrollContainerElement).scrollTop(1000);

await visit('ember/1.0/modules/runtime');
await visit('ember/1.0/packages/runtime');

assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project-version.module.index to project-version.module.index (same route different model)');
assert.equal($(scrollContainerElement).scrollTop(), 0, 'scroll position is resetted after transition: project-version.package.index to project-version.package.index (same route different model)');
$(scrollContainerElement).scrollTop(1000);

await visit('ember/1.0/namespaces/Ember');
Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/sidebar-nav-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ test('can navigate to namespace from sidebar', async function(assert) {
assert.equal(currentURL(), '/ember/1.0/namespaces/Ember.String', 'navigated to namespace');
});

test('can navigate to module from sidebar', async function(assert) {
test('can navigate to package from sidebar', async function(assert) {
await visit('/ember/1.0');
await click(`${testSelector('module', 'ember-application')} a`);

assert.equal(currentURL(), '/ember/1.0/modules/ember-application', 'navigated to module');
assert.equal(currentURL(), '/ember/1.0/packages/ember-application', 'navigated to package');
});

test('can navigate to class from sidebar', async function(assert) {
Expand Down
10 changes: 5 additions & 5 deletions tests/acceptance/switch-versions-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ test('switching versions', async function(assert) {
await selectChoose('.select-container', '2.8');
assert.equal(currentURL(), '/ember/2.8/namespaces/Ember.String', 'navigated to v2.8 namespace');

// Modules
// Packages (formerly known as modules)

await visit('/ember/2.8/modules/ember-metal');
assert.equal(currentURL(), '/ember/2.8/modules/ember-metal', 'navigated to v2.8 module');
await visit('/ember/2.8/packages/ember-metal');
assert.equal(currentURL(), '/ember/2.8/packages/ember-metal', 'navigated to v2.8 package');

await selectChoose('.select-container', '2.11');
assert.equal(currentURL(), '/ember/2.11/modules/ember-metal', 'navigated to v2.11 module');
assert.equal(currentURL(), '/ember/2.11/packages/ember-metal', 'navigated to v2.11 package');

await selectChoose('.select-container', '2.7');
assert.equal(currentURL(), '/ember/2.7/modules/ember-metal', 'navigated to v2.7 module');
assert.equal(currentURL(), '/ember/2.7/packages/ember-metal', 'navigated to v2.7 package');
});