@@ -35,17 +35,13 @@ void main() {
3535 '--remote=origin' ,
3636 ], errorHandler: errorHandler);
3737
38- RepositoryPackage createTestPackage () {
39- final RepositoryPackage package = createFakePackage ('a_package' , packagesDir);
38+ RepositoryPackage createTestPackage ({ String version = '1.0.0' } ) {
39+ final RepositoryPackage package = createFakePackage ('a_package' , packagesDir, version : version );
4040
4141 package.changelogFile.writeAsStringSync ('''
42- ## 1.0.0
42+ ## $ version
4343
4444- Old changes
45- ''' );
46- package.pubspecFile.writeAsStringSync ('''
47- name: a_package
48- version: 1.0.0
4945''' );
5046 package.directory.childDirectory ('pending_changelogs' ).createSync ();
5147 return package;
@@ -184,6 +180,89 @@ version: patch
184180 expect (changelogContent, contains ('A new feature' ));
185181 expect (gitProcessRunner.recordedCalls, orderedEquals (getExpectedGitCalls ('1.0.1' )));
186182 });
183+ test ('bumps "patch" version for minor pre-1.0' , () async {
184+ final RepositoryPackage package = createTestPackage (version: '0.1.0' );
185+ addTearDown (() {
186+ package.directory.deleteSync (recursive: true );
187+ });
188+ createPendingChangelogFile (package, 'a.yaml' , '''
189+ changelog: A new feature
190+ version: minor
191+ ''' );
192+
193+ final List <String > output = await runBatchCommand ();
194+
195+ expect (
196+ output,
197+ containsAllInOrder (< String > [
198+ 'Parsing package "a_package"...' ,
199+ ' Creating new branch "release-branch"...' ,
200+ ' Pushing branch release-branch to remote origin...' ,
201+ ]),
202+ );
203+
204+ expect (package.pubspecFile.readAsStringSync (), contains ('version: 0.1.1' ));
205+ final String changelogContent = package.changelogFile.readAsStringSync ();
206+ expect (changelogContent, startsWith ('## 0.1.1' ));
207+ expect (changelogContent, contains ('A new feature' ));
208+ expect (gitProcessRunner.recordedCalls, orderedEquals (getExpectedGitCalls ('0.1.1' )));
209+ });
210+
211+ test ('bumps "minor" version for major in pre-1.0' , () async {
212+ final RepositoryPackage package = createTestPackage (version: '0.1.0' );
213+ addTearDown (() {
214+ package.directory.deleteSync (recursive: true );
215+ });
216+ createPendingChangelogFile (package, 'a.yaml' , '''
217+ changelog: A new feature
218+ version: major
219+ ''' );
220+
221+ final List <String > output = await runBatchCommand ();
222+
223+ expect (
224+ output,
225+ containsAllInOrder (< String > [
226+ 'Parsing package "a_package"...' ,
227+ ' Creating new branch "release-branch"...' ,
228+ ' Pushing branch release-branch to remote origin...' ,
229+ ]),
230+ );
231+
232+ expect (package.pubspecFile.readAsStringSync (), contains ('version: 0.2.0' ));
233+ final String changelogContent = package.changelogFile.readAsStringSync ();
234+ expect (changelogContent, startsWith ('## 0.2.0' ));
235+ expect (changelogContent, contains ('A new feature' ));
236+ expect (gitProcessRunner.recordedCalls, orderedEquals (getExpectedGitCalls ('0.2.0' )));
237+ });
238+
239+ test ('bumps build number for patch in pre-1.0' , () async {
240+ final RepositoryPackage package = createTestPackage (version: '0.1.0' );
241+ addTearDown (() {
242+ package.directory.deleteSync (recursive: true );
243+ });
244+ createPendingChangelogFile (package, 'a.yaml' , '''
245+ changelog: A new feature
246+ version: patch
247+ ''' );
248+
249+ final List <String > output = await runBatchCommand ();
250+
251+ expect (
252+ output,
253+ containsAllInOrder (< String > [
254+ 'Parsing package "a_package"...' ,
255+ ' Creating new branch "release-branch"...' ,
256+ ' Pushing branch release-branch to remote origin...' ,
257+ ]),
258+ );
259+
260+ expect (package.pubspecFile.readAsStringSync (), contains ('version: 0.1.0+1' ));
261+ final String changelogContent = package.changelogFile.readAsStringSync ();
262+ expect (changelogContent, startsWith ('## 0.1.0+1' ));
263+ expect (changelogContent, contains ('A new feature' ));
264+ expect (gitProcessRunner.recordedCalls, orderedEquals (getExpectedGitCalls ('0.1.0+1' )));
265+ });
187266
188267 test ('merges multiple changelogs, minor and major' , () async {
189268 final RepositoryPackage package = createTestPackage ();
@@ -599,43 +678,5 @@ version: major
599678
600679 expect (output.last, contains ('Failed to push to release-a_package-2.0.0: error' ));
601680 });
602-
603- test ('throws for pre-1.0.0 packages' , () async {
604- final RepositoryPackage package = createFakePackage ('a_package' , packagesDir);
605-
606- addTearDown (() {
607- package.directory.deleteSync (recursive: true );
608- });
609-
610- // Set a pre-1.0.0 version.
611- package.changelogFile.writeAsStringSync ('''
612- ## 0.5.0
613-
614- - Old changes
615- ''' );
616- package.pubspecFile.writeAsStringSync ('''
617- name: a_package
618- version: 0.5.0
619- ''' );
620- package.directory.childDirectory ('pending_changelogs' ).createSync ();
621- createPendingChangelogFile (package, 'a.yaml' , '''
622- changelog: A new feature
623- version: minor
624- ''' );
625-
626- final List <String > output = await runBatchCommand (
627- errorHandler: (Error e) {
628- expect (e, isA <ToolExit >());
629- expect ((e as ToolExit ).exitCode, 3 );
630- },
631- );
632-
633- expect (
634- output.last,
635- contains (
636- 'This script only supports packages with version >= 1.0.0. Current version: 0.5.0.' ,
637- ),
638- );
639- });
640681 });
641682}
0 commit comments