lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-07-17 19:37:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #289 from bclozel:gh-286

Browse Source 
* pr/289:
  Polish contribution
  Deselect incompatible deps when changing Boot version
  Upgrade to JQuery 3.1.0
This commit is contained in:
Stephane Nicoll 2016-09-16 17:25:20 +02:00
commit ddf3686612
5 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
initializr-web/src/main/resources/static/js/jquery-1.11.3.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
initializr-web/src/main/resources/static/js/jquery-3.1.0.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

7
initializr-web/src/main/resources/static/js/start.js
View File

@ -126,10 +126,13 @@ $(function () {
var versions = new Versions(); var versions = new Versions();
$("#dependencies div.checkbox").each(function (idx, item) { $("#dependencies div.checkbox").each(function (idx, item) {
if ($(item).attr('data-range') === 'null' || versions.matchRange($(item).attr('data-range'))(versionRange)) { if ($(item).attr('data-range') === 'null' || versions.matchRange($(item).attr('data-range'))(versionRange)) {
$(item).show(); $("input", item).removeAttr("disabled");
$(item).removeClass("disabled");
} else { } else {
$(item).hide();
$("input", item).prop('checked', false); $("input", item).prop('checked', false);
$(item).addClass("disabled");
$("input", item).attr("disabled", true);
removeTag($("input", item).val());
} }
}); });
}; };

2
initializr-web/src/main/resources/templates/home.html
View File

@ -168,7 +168,7 @@
and <a href="https://run.pivotal.io">Pivotal Web Services</a></p> and <a href="https://run.pivotal.io">Pivotal Web Services</a></p>
</div> </div>
</footer> </footer>
<script src="/js/jquery-1.11.3.min.js"></script> <script src="/js/jquery-3.1.0.min.js"></script>
<script src="/js/typeahead.bundle.min.js"></script> <script src="/js/typeahead.bundle.min.js"></script>
<script src="/js/mousetrap.min.js"></script> <script src="/js/mousetrap.min.js"></script>
<script src="/js/start.js"></script> <script src="/js/start.js"></script>

19
initializr-web/src/test/groovy/io/spring/initializr/web/project/ProjectGenerationSmokeTests.groovy
View File

@ -153,6 +153,25 @@ class ProjectGenerationSmokeTests extends AbstractInitializrControllerIntegratio
} }
} }
@Test
void selectDependencyAndChangeToIncompatibleVersionRemovesIt() {
toHome {
selectDependency(page, 'Data JPA')
selectDependency(page, 'org.acme:bur')
page.bootVersion = '1.0.2.RELEASE' // Bur isn't available anymore
page.generateProject.click()
at HomePage
assertSimpleProject()
.isMavenProject()
.pomAssert()
.hasSpringBootParent('1.0.2.RELEASE')
.hasDependenciesCount(2)
.hasSpringBootStarterDependency('data-jpa')
.hasSpringBootStarterTest()
}
}
ProjectAssert assertSimpleProject() { ProjectAssert assertSimpleProject() {
zipProjectAssert(from('demo.zip')) zipProjectAssert(from('demo.zip'))
.hasBaseDir("demo") .hasBaseDir("demo")